╭─────────────╮ │scroll to top│ ╰─────────────╯ ╭ thread.zig ───────────────────────────────────────────────────╮ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ ╰───────────────────────────────────────────────────────────────╯
🬐 🬠 🬞🬂🬏 🬟 🬑 🬟 🬑 ╭5078e579..╮ 5078e579.. see-em: 🬋🬋🬋 🬋🬋🬋 🬋 🬋 │files │ commits refs discuss issues new login 🬐 🬠 🬐 🬠 🬑 🬟 🬰 ╰──────────╯ (675) user
╭────╮ ╭ clone ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ╮ │http│ ssh │ │ ╰────╯ ╰ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ╯
.. ╭─────────────────────────────────╮ │thread.zig │ ╰─────────────────────────────────╯
2550 fn resolveScroll(self: *This) ?*wgt.Scroll(Widget) { 2551 return switch (self.viewStack().children.values()[form_view_index]) { 2552 .scroll => |*scroll| scroll, 2553 else => null, 2554 }; 2555 } 2556 2557 fn listScroll(self: *This, index: usize) *wgt.Scroll(Widget) { 2558 return &self.resultsBox(index).children.values()[list_index].widget.scroll; 2559 } 2560 2561 fn listBox(self: *This, index: usize) *wgt.Box(Widget) { 2562 return &self.listScroll(index).child.box; 2563 } 2564 2565 fn detailFrame(self: *This, index: usize) *wgt.Box(Widget) { 2566 return &self.resultsBox(index).children.values()[detail_index].widget.box; 2567 } 2568 2569 fn detail(self: *This, index: usize) *DetailType { 2570 return &@field(self.detailFrame(index).children.values()[widget.list_pane_index].widget, Data.detail_widget_name); 2571 } 2572 2573 fn window(self: *This, index: usize) *const Window { 2574 if (supports_conflicts and index == conflict_view_index) return &self.data.conflicts; 2575 if (supports_drafts and index == drafts_view_index) return &self.data.drafts; 2576 return self.data.window(splitStatus(index)); 2577 } 2578 2579 // an empty first window, which shows the empty message 2580 fn windowEmpty(win: *const Window) bool { 2581 return win.items.len == 0 and win.prev_id == null; 2582 } 2583 2584 fn stackSelectedIndex(self: *This) ?usize { 2585 const stack = self.viewStack(); 2586 const cid = stack.getFocus().child_id orelse return null; 2587 return stack.children.getIndex(cid); 2588 } 2589 2590 // the stack's selected master-detail split (null when the labels view, the 2591 // new-thread form, or the empty message shows). 2592 fn selectedSplitIndex(self: *This) ?usize { 2593 const idx = self.stackSelectedIndex() orelse return null; 2594 const split = idx < status_count or (supports_drafts and idx == drafts_view_index) or idx == conflict_view_index; 2595 return if (split and !windowEmpty(self.window(idx))) idx else null; 2596 } 2597 2598 fn detailActive(self: *This, index: usize) bool { 2599 const rb = self.resultsBox(index); 2600 const cid = rb.getFocus().child_id orelse return false; 2601 return rb.children.getIndex(cid) == detail_index; 2602 } 2603 2604 fn headerActive(self: *This) bool { 2605 const cid = self.box.getFocus().child_id orelse return false; 2606 return self.box.children.getIndex(cid) == header_index; 2607 } 2608 2609 fn labelsViewActive(self: *This) bool { 2610 if (self.headerActive()) return false; 2611 return self.stackSelectedIndex() == labels_view_index; 2612 } 2613 2614 fn formViewActive(self: *This) bool { 2615 if (self.headerActive()) return false; 2616 return self.stackSelectedIndex() == form_view_index; 2617 } 2618 2619 // the selected thread's index, or null when a window-navigation row is 2620 // selected (a leading "previous" row shifts the thread rows down by one). 2621 fn selectedThreadIndex(self: *This, index: usize) ?usize { 2622 const lb = self.listBox(index); 2623 const cid = lb.getFocus().child_id orelse return null; 2624 const idx = lb.children.getIndex(cid) orelse return null; 2625 const win = self.window(index); 2626 const lead: usize = if (win.prev_id != null) 1 else 0; 2627 if (idx < lead or idx - lead >= win.items.len) return null; 2628 return idx - lead; 2629 } 2630 2631 // swap the detail pane to the selected thread when it changes 2632 fn refreshDetail(self: *This, allocator: std.mem.Allocator, index: usize) !void { 2633 const selected = self.selectedThreadIndex(index) orelse return; 2634 const entry = self.window(index).items[selected]; 2635 const changed = if (self.detail(index).entry) |current| !std.mem.eql(u8, current.id, entry.id) else true; 2636 if (!changed) return; 2637 try self.detail(index).setEntry(allocator, entry); 2638 widget.setListBackLink(self.detailFrame(index), try rowLink(self.session.page_arena, self.data, entry.id)); 2639 } 2640 2641 pub fn build(self: *This, allocator: std.mem.Allocator, constraint: layout.Constraint, root_focus: *Focus) !void { 2642 self.clearGrid(); 2643 2644 // each header tab maps 1:1 to a stack child by position 2645 if (self.header().getSelectedIndex()) |index| { 2646 const stack = self.viewStack(); 2647 stack.getFocus().child_id = stack.children.keys()[index]; 2648 } 2649 2650 if (self.selectedSplitIndex()) |i| { 2651 // whether the detail pane fits beside the list, which decides 2652 // the list cap below and whether the detail carries a way back 2653 const both_panes_fit = if (constraint.max_size.width) |w| w >= list_max_width + detail_min_width else true; 2654 try self.refreshDetail(allocator, i); 2655 widget.showListBack(self.detailFrame(i), !both_panes_fit); 2656 2657 // the selected list row shows a border (the focused TextBox 2658 // upgrades it to a double border itself); the rest stay borderless. 2659 const lb = self.listBox(i); 2660 for (lb.children.keys(), lb.children.values()) |id, *child| { 2661 switch (child.widget) { 2662 .text_box => |*tb| widget.markSelected(tb, lb.getFocus().child_id == id), 2663 else => {}, 2664 } 2665 } 2666 2667 // cap the list at list_max_width only while the detail pane fits 2668 // beside it. the box drops the detail when the width can't hold 2669 // both minimums, so when it's that narrow we lift the cap and let 2670 // the list fill the whole width. 2671 self.resultsBox(i).children.values()[list_index].max_size = if (both_panes_fit) .{ .width = list_max_width, .height = null } else null; 2672 2673 // stretch the detail pane across the rest of the width so it fills 2674 // the area rather than shrinking to its content; its scroll fills 2675 // the pane. 2676 if (constraint.max_size.width) |w| { 2677 self.resultsBox(i).children.values()[detail_index].min_size = .{ .width = if (both_panes_fit) w - list_max_width else w, .height = null }; 2678 } else { 2679 self.resultsBox(i).children.values()[detail_index].min_size = .{ .width = detail_min_width, .height = null }; 2680 } 2681 } 2682 2683 // refresh the form inputs' entries in the session's focus-id -> input 2684 // map with this frame's addresses, so the web/wasm form handling can 2685 // find them by focus id 2686 if (self.threadForm()) |form| { 2687 const failure = if (self.session.formFeedback(feedback_tag)) |saved| saved.failure else null; 2688 (try formField(form, "title")).options.top_label.text = if (failure == .required_title) " title (required) " else " title "; 2689 if (comptime supports_drafts) { 2690 if (formWidget(form, .patch_source)) |source| { 2691 source.field().options.top_label.text = if (failure == .invalid_source_branch) " source branch (not found) " else if (failure == .same_branch) " source branch (same as target) " else if (failure == .unrelated_branches) " source branch (unrelated) " else " source branch "; 2692 const submit = formWidget(form, .submit_button) orelse return error.MissingFormField; 2693 try submit.setLabel(allocator, switch (source.selectedKind()) { 2694 .fork => "submit draft", 2695 .branch => "submit patch", 2696 }); 2697 } 2698 (try formField(form, "target_branch")).options.top_label.text = 2699 if (failure == .invalid_target_branch) " target branch (invalid) " else if (self.data.view == .edit and failure == .same_branch) " target branch (same as source) " else if (self.data.view == .edit and failure == .unrelated_branches) " target branch (unrelated to source) " else if (self.data.view == .edit and failure == .invalid_source_branch) " target branch (source branch not found) " else " target branch "; 2700 } 2701 } 2702 if (self.formBox()) |form| { 2703 const inputs_arena = self.session.arena.allocator(); 2704 for (form.children.values()) |*child| switch (child.widget) { 2705 .text_input => |*ti| try self.session.text_inputs.put(inputs_arena, ti.getFocus().id, ti), 2706 else => {}, 2707 }; 2708 } 2709 2710 try self.box.build(allocator, constraint, root_focus); 2711 } 2712 2713 pub fn input(self: *This, allocator: std.mem.Allocator, raw_key: Key, root_focus: *Focus) !void { 2714 // wheel input moves focus like the arrows 2715 const key: Key = switch (raw_key) { 2716 .scroll_up => .arrow_up, 2717 .scroll_down => .arrow_down, 2718 else => raw_key, 2719 }; 2720 2721 if (self.headerActive()) { 2722 // down from the sub-header re-enters the stack if the selected 2723 // view has something to focus; enter in the search box submits 2724 // the query; other keys move within the sub-header. 2725 if (inp.vertDirection(key) == .down) { 2726 const enterable = if (self.stackSelectedIndex()) |idx| 2727 if (idx == labels_view_index) 2728 !labelsEmpty(self.data) 2729 else if (idx == form_view_index) 2730 // nothing focusable in the unauthorized view 2731 self.viewStack().children.values()[idx] != .unauthorized 2732 else 2733 !windowEmpty(self.window(idx)) 2734 else 2735 false; 2736 if (enterable) root_focus.setFocus(self.box.children.keys()[stack_index]); 2737 } else if (key == .enter) { 2738 if (try self.header().submittedText(allocator)) |submission| { 2739 defer allocator.free(submission.text); 2740 switch (submission.kind) { 2741 .search => try self.submitSearch(submission.text), 2742 .assignee => try self.submitAssignee(submission.text), 2743 } 2744 } 2745 } else { 2746 try self.header().input(allocator, key, root_focus); 2747 } 2748 return; 2749 } 2750 if (self.labelsViewActive()) { 2751 self.labelsViewInput(key, root_focus); 2752 return; 2753 } 2754 if (self.formViewActive()) { 2755 if (confirmation(self.data.view) != null) { 2756 try self.confirmationFormInput(allocator, key, root_focus); 2757 } else if (supports_conflicts and self.data.view == .resolve) { 2758 try self.resolveInput(allocator, key, root_focus); 2759 } else { 2760 try self.formInput(allocator, key, root_focus); 2761 } 2762 return; 2763 } 2764 const i = self.selectedSplitIndex() orelse return; 2765 if (self.detailActive(i)) { 2766 // the way back to the list, by enter or a click 2767 if (widget.listBackId(self.detailFrame(i))) |id| { 2768 if (inp.activated(root_focus, id, key)) return self.focusList(i, root_focus); 2769 if (root_focus.grandchild_id == id) return switch (key) { 2770 .arrow_left => self.focusList(i, root_focus), 2771 .arrow_up => self.focusHeader(root_focus), 2772 .arrow_down => _ = self.detail(i).focusFirst(root_focus), 2773 else => {}, 2774 }; 2775 } 2776 switch (try self.detail(i).inputWithExit(allocator, key, root_focus)) { 2777 .none => {}, 2778 .list => self.focusList(i, root_focus), 2779 .header => if (widget.listBackId(self.detailFrame(i))) |id| root_focus.setFocus(id) else self.focusHeader(root_focus), 2780 } 2781 } else { 2782 try self.listInput(allocator, i, key, root_focus); 2783 } 2784 } 2785 2786 // navigate to the typed query's results, keeping the label filter and the 2787 // status list the page shows. an empty box clears a filtered page and 2788 // does nothing on any other one. 2789 fn submitSearch(self: *This, text: []const u8) !void { 2790 if (text.len == 0 and self.data.search == null) return; 2791 const selected = self.header().getSelectedIndex() orelse 0; 2792 const status: Status = if (selected < status_count) splitStatus(selected) else @fromBackingInt(@intCast(0)); 2793 var route = listRoute(self.data.identity, status, self.data.label, "") orelse return; 2794 const assignee = assigneeFilter(self.data); 2795 if (assignee.len != 0) route = route.withEncodedAssignee(assignee) orelse return; 2796 try self.session.navigate(route.withSearch(text) orelse return); 2797 } 2798 2799 // navigate to the issues assigned to the typed name or email, keeping 2800 // the label, the search and the status list. an empty box clears the 2801 // filter and does nothing on an unfiltered page. 2802 fn submitAssignee(self: *This, typed: []const u8) !void { 2803 const text = std.mem.trim(u8, typed, " \t"); 2804 if (text.len == 0 and assigneeFilter(self.data).len == 0) return; 2805 const selected = self.header().getSelectedIndex() orelse 0; 2806 const status: Status = if (selected < status_count) splitStatus(selected) else @fromBackingInt(@intCast(0)); 2807 var route = listRoute(self.data.identity, status, self.data.label, "") orelse return; 2808 if (self.data.search) |search| route = route.withSearch(search) orelse return; 2809 try self.session.navigate(route.withEncodedAssignee(try ui.urlEncodeRef(self.session.page_arena.allocator(), text)) orelse return); 2810 } 2811 2812 // arrow keys move the label selection; up from the top row crosses to the 2813 // header tabs. 2814 fn labelsViewInput(self: *This, key: Key, root_focus: *Focus) void { 2815 const tf = self.labelsView(); 2816 const cid = tf.focus.child_id orelse return; 2817 const cur = tf.indexOfFocusId(cid) orelse return; 2818 const count = tf.text_boxes.items.len; 2819 switch (key) { 2820 .arrow_left => if (cur > 0) root_focus.setFocus(tf.text_boxes.items[cur - 1].getFocus().id), 2821 .arrow_right => if (cur + 1 < count) root_focus.setFocus(tf.text_boxes.items[cur + 1].getFocus().id), 2822 .arrow_up => if (tf.rowStep(cur, false)) |i| root_focus.setFocus(tf.text_boxes.items[i].getFocus().id) else self.focusHeader(root_focus), 2823 .arrow_down => if (tf.rowStep(cur, true)) |i| root_focus.setFocus(tf.text_boxes.items[i].getFocus().id), 2824 .home => root_focus.setFocus(tf.text_boxes.items[0].getFocus().id), 2825 .end => root_focus.setFocus(tf.text_boxes.items[count - 1].getFocus().id), 2826 else => {}, 2827 } 2828 } 2829 2830 fn listInput(self: *This, allocator: std.mem.Allocator, index: usize, key: Key, root_focus: *Focus) !void { 2831 // up/down (and the scroll wheel) move the selection a row; page up/down 2832 // jump a fixed amount. right/Enter cross into the detail pane. up from 2833 // the top row crosses into the header tabs. 2834 if (inp.rowDelta(key, @intCast(self.listBox(index).children.count()))) |delta| { 2835 const lb = self.listBox(index); 2836 const at_top = if (lb.getFocus().child_id) |cid| lb.children.getIndex(cid) == 0 else true; 2837 if (delta < 0 and at_top) return self.focusHeader(root_focus); 2838 moveRowFocus(lb, self.listScroll(index), root_focus, delta); 2839 return; 2840 } 2841 switch (key) { 2842 .enter, .arrow_right => self.focusDetail(index, root_focus), 2843 // when the window is too narrow to lay out the detail pane beside 2844 // the list, a click on a row opens it like enter. the row was just 2845 // selected, so the detail is swapped to it ahead of the build. 2846 .mouse => |mouse| if (self.resultsBox(index).children.values()[detail_index].rect == null and widget.clickOnSelectedRow(self.listBox(index), root_focus, mouse)) { 2847 try self.refreshDetail(allocator, index); 2848 self.focusDetail(index, root_focus); 2849 }, 2850 else => {}, 2851 } 2852 } 2853 2854 fn formInput(self: *This, allocator: std.mem.Allocator, key: Key, root_focus: *Focus) !void { 2855 const form = self.formBox() orelse return; 2856 const cid = form.getFocus().child_id orelse return; 2857 const cur = form.children.getIndex(cid) orelse return; 2858 const child = &form.children.values()[cur]; 2859 2860 if (child.widget == .text_input) { 2861 const text_input = &child.widget.text_input; 2862 if (text_input.options.multiline and try multilineKeepsKey(text_input, allocator, key)) 2863 return child.widget.input(allocator, key, root_focus); 2864 } 2865 2866 const on_submit = child.widget == .submit_button; 2867 switch (key) { 2868 .arrow_up, .back_tab => return if (formStep(form, cur, false)) |i| 2869 root_focus.setFocus(form.children.keys()[i]) 2870 else 2871 self.focusHeader(root_focus), 2872 .arrow_down, .tab => return if (formStep(form, cur, true)) |i| root_focus.setFocus(form.children.keys()[i]), 2873 .enter => if (on_submit) return self.submitForm(allocator), 2874 .mouse => |mouse| if (on_submit) { 2875 if (inp.leftClickOn(root_focus, child.widget.submit_button.buttonId(), mouse)) return self.submitForm(allocator); 2876 }, 2877 else => {}, 2878 } 2879 try child.widget.input(allocator, key, root_focus); 2880 } 2881 2882 fn confirmationFormInput(self: *This, allocator: std.mem.Allocator, key: Key, root_focus: *Focus) !void { 2883 const form = self.confirmationForm() orelse return; 2884 const child_id = form.getFocus().child_id orelse return; 2885 const index = form.children.getIndex(child_id) orelse return; 2886 switch (key) { 2887 .arrow_up, .back_tab => if (index > 1) 2888 root_focus.setFocus(form.children.keys()[index - 1]) 2889 else 2890 self.focusHeader(root_focus), 2891 .arrow_down, .tab => if (index + 1 < form.children.count()) root_focus.setFocus(form.children.keys()[index + 1]), 2892 .enter => try self.submitConfirmation(allocator, index), 2893 .mouse => |mouse| for (form.children.keys()[1..], 1..) |button_id, button_index| { 2894 if (inp.leftClickOn(root_focus, button_id, mouse)) { 2895 try self.submitConfirmation(allocator, button_index); 2896 break; 2897 } 2898 }, 2899 else => {}, 2900 } 2901 } 2902 2903 // the multiline hunk inputs keep enter and any up/down that has a row to 2904 // move to; enter on a "use this" link is a navigation the host follows 2905 // before this runs. 2906 fn resolveInput(self: *This, allocator: std.mem.Allocator, key: Key, root_focus: *Focus) !void { 2907 const form = self.formBox() orelse return; 2908 const cid = form.getFocus().child_id orelse return; 2909 const cur = form.children.getIndex(cid) orelse return; 2910 const child = &form.children.values()[cur]; 2911 2912 if (child.widget == .text_input) { 2913 const ti = &child.widget.text_input; 2914 if (ti.options.multiline and try multilineKeepsKey(ti, allocator, key)) 2915 return child.widget.input(allocator, key, root_focus); 2916 } 2917 2918 const on_submit = child.widget == .submit_button; 2919 2920 switch (key) { 2921 .arrow_up, .back_tab => if (formStep(form, cur, false)) |i| self.focusResolveChild(form, i, root_focus) else self.focusHeader(root_focus), 2922 .arrow_down, .tab => if (formStep(form, cur, true)) |i| self.focusResolveChild(form, i, root_focus), 2923 .arrow_left, .arrow_right => switch (child.widget) { 2924 .box => |*row| _ = widget.moveInRow(row, root_focus, key == .arrow_right), 2925 else => try child.widget.input(allocator, key, root_focus), 2926 }, 2927 .enter => if (on_submit) try self.submitResolution(allocator), 2928 .mouse => |mouse| if (on_submit) { 2929 if (inp.leftClickOn(root_focus, child.widget.submit_button.buttonId(), mouse)) try self.submitResolution(allocator); 2930 }, 2931 else => try child.widget.input(allocator, key, root_focus), 2932 } 2933 } 2934 2935 // a multiline input keeps enter and any up/down that has a row to move to 2936 fn multilineKeepsKey(text_input: *wgt.TextInput, allocator: std.mem.Allocator, key: Key) !bool { 2937 return switch (key) { 2938 .enter => true, 2939 .arrow_up => !try text_input.cursorOnFirstRow(allocator), 2940 .arrow_down => !try text_input.cursorOnLastRow(allocator), 2941 else => false, 2942 }; 2943 } 2944 2945 // the neighboring form control, skipping spacers and blank rows 2946 fn formStep(form: *wgt.Box(Widget), cur: usize, down: bool) ?usize { 2947 var i = cur; 2948 while (true) { 2949 if (down) { 2950 i += 1; 2951 if (i >= form.children.count()) return null; 2952 } else { 2953 if (i == 0) return null; 2954 i -= 1; 2955 } 2956 const child = &form.children.values()[i]; 2957 if (child.hidden) continue; 2958 switch (child.widget) { 2959 .spacer, .text => continue, 2960 else => return i, 2961 } 2962 } 2963 } 2964 2965 // focus the resolve-form child at `i` (a version row focuses its selected 2966 // child) and keep it visible on the terminal 2967 fn focusResolveChild(self: *This, form: *wgt.Box(Widget), i: usize, root_focus: *Focus) void { 2968 const child = &form.children.values()[i]; 2969 switch (child.widget) { 2970 .box => |*row| root_focus.setFocus(row.getFocus().child_id orelse form.children.keys()[i]), 2971 else => root_focus.setFocus(form.children.keys()[i]), 2972 } 2973 if (self.session.is_terminal) { 2974 if (self.resolveScroll()) |sc| { 2975 if (child.rect) |rect| sc.scrollToRect(rect); 2976 } 2977 } 2978 } 2979 2980 // re-emit the conflicted thread's event with the resolved content; any 2981 // event on the thread settles its conflict entry. this is the terminal 2982 // path; the web posts the form to the resolve route. 2983 fn submitResolution(self: *This, allocator: std.mem.Allocator) !void { 2984 if (comptime wasm) return; 2985 const io = self.session.io orelse return; 2986 const src = self.data.repo_source orelse return; 2987 const entry = self.data.selectedThread() orelse return; 2988 const author = ((try self.session.authorize(self.data.identity, .write, kind)) orelse return).author; 2989 const form = self.formBox() orelse return; 2990 2991 // gather the inputs by name; the d<n> hunk inputs appear in chunk order 2992 var title: ?[]u8 = null; 2993 var labels: ?[]u8 = null; 2994 var hunks: std.ArrayList([]const u8) = .empty; 2995 defer { 2996 if (title) |t| allocator.free(t); 2997 if (labels) |t| allocator.free(t); 2998 for (hunks.items) |h| allocator.free(h); 2999 hunks.deinit(allocator); 3000 } 3001 for (form.children.values()) |*child| switch (child.widget) { 3002 .text_input => |*ti| { 3003 const text = try ti.text(allocator); 3004 errdefer allocator.free(text); 3005 if (std.mem.eql(u8, ti.options.name, "title")) { 3006 title = text; 3007 } else if (std.mem.eql(u8, ti.options.name, "labels")) { 3008 labels = text; 3009 } else { 3010 try hunks.append(allocator, text); 3011 } 3012 }, 3013 else => {}, 3014 }; 3015 3016 const id_bytes = try evt.parseEventId(entry.id); 3017 3018 switch (src.repo_kind) { 3019 inline else => |repo_kind| { 3020 var any_repo = try rp.AnyRepo(repo_kind, .{}).open(io, allocator, src.localInitOpts()); 3021 defer any_repo.deinit(io, allocator); 3022 switch (any_repo) { 3023 inline else => |*repo| { 3024 var resolution: Event.Resolve = .{ 3025 .title = title, 3026 .labels = labels, 3027 .hunks = hunks.items, 3028 }; 3029 if (comptime @hasField(Event.Resolve, "theirs")) resolution.theirs = self.data.theirs_picks; 3030 const change = Event.Update{ .resolve = resolution }; 3031 Event.update(self.session.eventHost(), repo_kind, repo.self_repo_opts, io, allocator, repo, &id_bytes, change, author) catch |err| switch (err) { 3032 // leave the form up for correction 3033 error.InvalidFields => return, 3034 else => |e| return e, 3035 }; 3036 }, 3037 } 3038 }, 3039 } 3040 3041 const route = listRoute(self.data.identity, entryStatus(entry.*), "", entry.id) orelse return; 3042 try self.session.navigate(route); 3043 } 3044 3045 // commit a new or edited comment and navigate to its permalink. this is the 3046 // terminal path; the web posts the form to its comment route. 3047 fn submitComment(self: *This, allocator: std.mem.Allocator) !void { 3048 if (comptime wasm) return; 3049 const io = self.session.io orelse return; 3050 const src = self.data.repo_source orelse return; 3051 const actor = (try self.session.authorize(self.data.identity, .read, kind)) orelse return; 3052 const author = actor.author; 3053 const form = self.formBox() orelse return; 3054 const body_input = try formField(form, "body"); 3055 const body = try body_input.text(allocator); 3056 defer allocator.free(body); 3057 if (!evt.Comment.fieldsValid(body)) return; 3058 3059 var thread_id: [evt.event_id_size * 2]u8 = undefined; 3060 @memcpy(&thread_id, self.data.selected_id); 3061 const parent_id = if (self.data.comment_id.len == 0) thread_id else blk: { 3062 var parent: [evt.event_id_size * 2]u8 = undefined; 3063 @memcpy(&parent, self.data.comment_id); 3064 break :blk parent; 3065 }; 3066 var event_id_hex: [evt.event_id_size * 2]u8 = undefined; 3067 const editing = self.data.view == .edit_comment; 3068 if (editing) { 3069 const comment_id = evt.parseEventId(self.data.comment_id) catch return; 3070 if (!try src.canModify(io, allocator, actor, .comment, &comment_id)) return; 3071 } 3072 switch (src.repo_kind) { 3073 inline else => |repo_kind| { 3074 var any_repo = try rp.AnyRepo(repo_kind, .{}).open(io, allocator, src.localInitOpts()); 3075 defer any_repo.deinit(io, allocator); 3076 switch (any_repo) { 3077 inline else => |*repo| if (editing) { 3078 const comment_id = evt.parseEventId(self.data.comment_id) catch return; 3079 try evt.Comment.update(self.session.eventHost(), repo_kind, repo.self_repo_opts, io, allocator, repo, kind, &thread_id, &comment_id, body, author); 3080 event_id_hex = std.fmt.bytesToHex(comment_id, .lower); 3081 } else { 3082 event_id_hex = try evt.Comment.create(self.session.eventHost(), repo_kind, repo.self_repo_opts, io, allocator, repo, kind, &thread_id, &parent_id, body, author); 3083 }, 3084 } 3085 }, 3086 } 3087 3088 body_input.clear(allocator); 3089 const route = ui.RoutablePage.repoThreadCommentRoute(kind, self.data.identity, &thread_id, &event_id_hex, 0) orelse return; 3090 try self.session.navigate(route); 3091 } 3092 3093 // terminal form submissions; the web posts to the forms' routes instead 3094 fn submitForm(self: *This, allocator: std.mem.Allocator) !void { 3095 switch (self.data.view) { 3096 .new_comment, .edit_comment => try self.submitComment(allocator), 3097 .edit => try self.submitEditedThread(allocator), 3098 else => try self.submitNewThread(allocator), 3099 } 3100 } 3101 3102 // commit the new thread to the repo's events branch and navigate to it. 3103 // this is the terminal path; the web posts the form to the thread route, 3104 // so the wasm side never runs (or compiles) the repo access below. 3105 fn submitNewThread(self: *This, allocator: std.mem.Allocator) !void { 3106 if (comptime wasm) return; 3107 const io = self.session.io orelse return; 3108 const src = self.data.repo_source orelse return; 3109 const actor = (try self.session.authorize(self.data.identity, .read, kind)) orelse return; 3110 3111 const form = self.threadForm() orelse return; 3112 const title_input = try formField(form, "title"); 3113 const labels_input = try formField(form, "labels"); 3114 const description_input = try formField(form, "description"); 3115 3116 const title = try title_input.text(allocator); 3117 defer allocator.free(title); 3118 const labels = try labels_input.text(allocator); 3119 defer allocator.free(labels); 3120 const description = try description_input.text(allocator); 3121 defer allocator.free(description); 3122 const target_branch = if (comptime supports_drafts) try (try formField(form, "target_branch")).text(allocator) else ""; 3123 defer if (comptime supports_drafts) allocator.free(target_branch); 3124 3125 if (!Event.fieldsValid(title, labels)) { 3126 if (!evt.titleValid(title)) try self.rememberThreadFeedback(.required_title, title, labels, description, target_branch); 3127 return; 3128 } 3129 3130 if (comptime supports_drafts) { 3131 const source = formWidget(form, .patch_source) orelse return error.MissingFormField; 3132 const source_branch = switch (source.selectedKind()) { 3133 .fork => null, 3134 .branch => try source.field().text(allocator), 3135 }; 3136 defer if (source_branch) |branch| allocator.free(branch); 3137 const event_id_hex = Data.create(self.data, self.session, allocator, actor, title, labels, description, target_branch, source_branch) catch |err| { 3138 const failure = FeedbackFailure.fromError(err) orelse return err; 3139 try self.rememberThreadFeedback(failure, title, labels, description, target_branch); 3140 return; 3141 }; 3142 title_input.clear(allocator); 3143 labels_input.clear(allocator); 3144 description_input.clear(allocator); 3145 (try formField(form, "target_branch")).clear(allocator); 3146 const route = ui.RoutablePage.repoThreadCommentsRoute(kind, self.data.identity, &event_id_hex, 0) orelse return; 3147 try self.session.navigate(route); 3148 return; 3149 } 3150 3151 var id_bytes: [evt.event_id_size]u8 = undefined; 3152 io.random(&id_bytes); 3153 const event_id_hex = std.fmt.bytesToHex(id_bytes, .lower); 3154 3155 const event = evt.EventWithId{ 3156 .id = event_id_hex, 3157 .timestamp = @intCast(std.Io.Timestamp.now(io, .real).toSeconds()), 3158 .author = actor.author, 3159 .event = @unionInit(evt.Event, @tagName(kind), Event{ 3160 .title = title, 3161 .description = description, 3162 .labels = labels, 3163 }), 3164 }; 3165 3166 switch (src.repo_kind) { 3167 inline else => |repo_kind| { 3168 var any_repo = try rp.AnyRepo(repo_kind, .{}).open(io, allocator, src.localInitOpts()); 3169 defer any_repo.deinit(io, allocator); 3170 switch (any_repo) { 3171 inline else => |*repo| try evt.consume(self.session.eventHost(), .repo, repo_kind, repo.self_repo_opts, io, allocator, repo, evt.events_ref, &.{event}), 3172 } 3173 }, 3174 } 3175 3176 // wipe the form so a return visit starts fresh 3177 title_input.clear(allocator); 3178 labels_input.clear(allocator); 3179 description_input.clear(allocator); 3180 3181 const route = listRoute(self.data.identity, @fromBackingInt(@intCast(0)), "", &event_id_hex) orelse return; 3182 try self.session.navigate(route); 3183 } 3184 3185 // re-emit the selected thread's event with the form's content (status 3186 // preserved), then reload the thread's page. this is the terminal path; 3187 // the web posts the form to the edit route. 3188 fn submitEditedThread(self: *This, allocator: std.mem.Allocator) !void { 3189 if (comptime wasm) return; 3190 const io = self.session.io orelse return; 3191 const entry = self.data.selectedThread() orelse return; 3192 const actor = (try self.session.authorize(self.data.identity, .read, kind)) orelse return; 3193 const author = actor.author; 3194 3195 const form = self.threadForm() orelse return; 3196 const title_input = try formField(form, "title"); 3197 const labels_input = try formField(form, "labels"); 3198 const description_input = try formField(form, "description"); 3199 3200 const title = try title_input.text(allocator); 3201 defer allocator.free(title); 3202 const labels = try labels_input.text(allocator); 3203 defer allocator.free(labels); 3204 const description = try description_input.text(allocator); 3205 defer allocator.free(description); 3206 const target_branch = if (comptime supports_drafts) try (try formField(form, "target_branch")).text(allocator) else ""; 3207 defer if (comptime supports_drafts) allocator.free(target_branch); 3208 3209 if (!Event.fieldsValid(title, labels)) { 3210 if (!evt.titleValid(title)) try self.rememberThreadFeedback(.required_title, title, labels, description, target_branch); 3211 return; 3212 } 3213 const src = self.data.repo_source orelse return; 3214 3215 if (comptime supports_drafts) { 3216 if (entryDraft(entry.*)) { 3217 self.data.editDraft(self.session, allocator, author, entry.id, title, labels, description, target_branch) catch |err| { 3218 const failure = FeedbackFailure.fromError(err) orelse return err; 3219 try self.rememberThreadFeedback(failure, title, labels, description, target_branch); 3220 return; 3221 }; 3222 const route = listRoute(self.data.identity, entryStatus(entry.*), "", entry.id) orelse return; 3223 try self.session.navigate(route); 3224 return; 3225 } 3226 } 3227 3228 const id_bytes = try evt.parseEventId(entry.id); 3229 if (!try src.canModify(io, allocator, actor, kind, &id_bytes)) return; 3230 3231 switch (src.repo_kind) { 3232 inline else => |repo_kind| { 3233 var any_repo = try rp.AnyRepo(repo_kind, .{}).open(io, allocator, src.localInitOpts()); 3234 defer any_repo.deinit(io, allocator); 3235 switch (any_repo) { 3236 inline else => |*repo| if (supports_drafts) { 3237 Event.update(self.session.eventHost(), repo_kind, repo.self_repo_opts, io, allocator, repo, &id_bytes, .{ .fields = .{ 3238 .title = title, 3239 .labels = labels, 3240 .description = description, 3241 .target_branch = target_branch, 3242 } }, author) catch |err| { 3243 const failure = FeedbackFailure.fromError(err) orelse return err; 3244 try self.rememberThreadFeedback(failure, title, labels, description, target_branch); 3245 return; 3246 }; 3247 } else if (has_status) 3248 try Event.update(self.session.eventHost(), repo_kind, repo.self_repo_opts, io, allocator, repo, &id_bytes, .{ .fields = .{ 3249 .title = title, 3250 .labels = labels, 3251 .description = description, 3252 } }, author) 3253 else 3254 try Event.update(self.session.eventHost(), repo_kind, repo.self_repo_opts, io, allocator, repo, &id_bytes, title, labels, description, author), 3255 } 3256 }, 3257 } 3258 3259 const route = listRoute(self.data.identity, entryStatus(entry.*), "", entry.id) orelse return; 3260 try self.session.navigate(route); 3261 } 3262 3263 fn rememberThreadFeedback(self: *This, failure: FeedbackFailure, title: []const u8, labels: []const u8, description: []const u8, target_branch: []const u8) !void { 3264 const aa = self.session.arena.allocator(); 3265 const source = if (supports_drafts) blk: { 3266 const form = self.threadForm() orelse break :blk null; 3267 break :blk formWidget(form, .patch_source); 3268 } else null; 3269 self.session.data.form_feedback = @unionInit(ui.Session.FormFeedback, @tagName(feedback_tag), .{ 3270 .failure = failure, 3271 .fields = if (comptime supports_drafts) .{ 3272 .title = try aa.dupe(u8, title), 3273 .labels = try aa.dupe(u8, labels), 3274 .description = try aa.dupe(u8, description), 3275 .target_branch = try aa.dupe(u8, target_branch), 3276 .source_branch = if (source) |value| try value.field().text(aa) else "", 3277 .source_kind = if (source) |value| value.selectedKind() else .fork, 3278 } else .{ 3279 .title = try aa.dupe(u8, title), 3280 .labels = try aa.dupe(u8, labels), 3281 .description = try aa.dupe(u8, description), 3282 }, 3283 }); 3284 } 3285 3286 fn submitConfirmation(self: *This, allocator: std.mem.Allocator, button_index: usize) !void { 3287 switch (confirmation(self.data.view) orelse return) { 3288 .publish => if (comptime supports_drafts) { 3289 if (comptime wasm) return; 3290 const entry = self.data.selectedThread() orelse return; 3291 if (!entryDraft(entry.*)) return; 3292 const author = ((try self.session.authorize(self.data.identity, .read, kind)) orelse return).author; 3293 try self.data.publishDraft(self.session, allocator, author, entry.id); 3294 const route = listRoute(self.data.identity, @fromBackingInt(@intCast(0)), "", entry.id) orelse return; 3295 try self.session.navigate(route); 3296 } else unreachable, 3297 .merge => if (comptime supports_merge) { 3298 if (comptime wasm) return; 3299 const entry = self.data.selectedThread() orelse return; 3300 const revision: evt.Patch.MergeRevision = if (button_index > 1) .squash else .source; 3301 if (!Data.canMerge(entry.*, self.session) or entry.mergeability.get(revision) != .clean) return; 3302 const author = ((try self.session.authorize(self.data.identity, .write, kind)) orelse return).author; 3303 self.data.mergePatch(self.session, allocator, author, entry.id, revision) catch |err| switch (err) { 3304 error.MergeConflict, error.MergeCheckUnavailable, error.PatchOutOfDate, error.PatchDataUnavailable => { 3305 const route = listRoute(self.data.identity, entryStatus(entry.*), "", entry.id) orelse return; 3306 try self.session.navigate(route); 3307 return; 3308 }, 3309 else => return err, 3310 }; 3311 const merged = std.meta.stringToEnum(Status, "merged") orelse return; 3312 const route = listRoute(self.data.identity, merged, "", entry.id) orelse return; 3313 try self.session.navigate(route); 3314 } else unreachable, 3315 .remove => try self.submitRemove(allocator), 3316 } 3317 } 3318 3319 fn submitRemove(self: *This, allocator: std.mem.Allocator) !void { 3320 const comment = self.data.comment_id.len != 0; 3321 const event_id = if (comment) self.data.comment_id else self.data.selected_id; 3322 const id = evt.parseEventId(event_id) catch return; 3323 try self.removeEvent(allocator, if (comment) .comment else kind, id); 3324 } 3325 3326 fn removeEvent(self: *This, allocator: std.mem.Allocator, event_kind: evt.EventKind, id: [evt.event_id_size]u8) !void { 3327 if (comptime wasm) return; 3328 const actor = (try self.session.authorize(self.data.identity, .read, kind)) orelse return; 3329 const author = actor.author; 3330 3331 if (comptime supports_drafts) { 3332 const selected = self.data.selectedThread() orelse return; 3333 if (event_kind == kind and entryDraft(selected.*)) { 3334 try Data.removeDraft(self.session, allocator, author, &id); 3335 const route = draftsRoute(self.data.identity) orelse return; 3336 try self.session.navigate(route); 3337 return; 3338 } 3339 } 3340 3341 const io = self.session.io orelse return; 3342 const src = self.data.repo_source orelse return; 3343 if (!try src.canModify(io, allocator, actor, event_kind, &id)) return; 3344 const thread_id = evt.parseEventId(self.data.selected_id) catch return; 3345 3346 switch (src.repo_kind) { 3347 inline else => |repo_kind| { 3348 var any_repo = try rp.AnyRepo(repo_kind, .{}).open(io, allocator, src.localInitOpts()); 3349 defer any_repo.deinit(io, allocator); 3350 switch (any_repo) { 3351 inline else => |*repo| try evt.removeInThread(self.session.eventHost(), repo_kind, repo.self_repo_opts, io, allocator, repo, kind, &thread_id, event_kind, &id, author), 3352 } 3353 }, 3354 } 3355 3356 const id_hex = std.fmt.bytesToHex(id, .lower); 3357 const route = ui.RoutablePage.repoEventsRoute(self.data.identity, .removed, event_kind, &id_hex, null) orelse return; 3358 try self.session.navigate(route); 3359 } 3360 3361 // enter the detail pane, landing on the way back to the list when it shows 3362 fn focusDetail(self: *This, index: usize, root_focus: *Focus) void { 3363 if (widget.listBackId(self.detailFrame(index)) != null) return widget.focusListBack(self.detailFrame(index), root_focus); 3364 _ = self.detail(index).focusFirst(root_focus); 3365 } 3366 3367 // return to the list. 3368 fn focusList(self: *This, index: usize, root_focus: *Focus) void { 3369 root_focus.setFocus(self.listScroll(index).getFocus().id); 3370 } 3371 3372 // cross to the header tabs above the stack. 3373 fn focusHeader(self: *This, root_focus: *Focus) void { 3374 root_focus.setFocus(self.box.children.keys()[header_index]); 3375 } 3376 3377 pub fn clearGrid(self: *This) void { 3378 self.box.clearGrid(); 3379 } 3380 3381 pub fn getGrid(self: This) ?Grid { 3382 return self.box.getGrid(); 3383 } 3384 3385 pub fn getFocus(self: *This) *Focus { 3386 return self.box.getFocus(); 3387 } 3388 3389 // for the parent's "scroll up at the top jumps to the header" check: at the 3390 // top only while the header tabs hold focus, so up from the split 3391 // crosses into the tabs first. 3392 pub fn atTop(self: *This) bool { 3393 return self.headerActive(); 3394 } 3395 }; 3396 } 3397