feat(search): cut/copy search results

Author: ycnmhd

src/helpers/sort-sections-by-depth.ts

@@ -0,0 +1,8 @@
+export const sortSectionsByDepthDesc = (keys: string[]): string[] => {
+    return keys.sort((a, b) => {
+        const aParts = a.split('.');
+        const bParts = b.split('.');
+
+        return bParts.length - aParts.length;
+    });
+};

src/lang/lang.ts

@@ -54,7 +54,7 @@ export const lang = {
     hkg_delete_cards: 'Delete cards',
     modals_snapshots_deleted_card: 'Deleted card ',
 
-    // copy
+    // clipboard
     cm_copy: 'Copy',
     cm_copy_branches: 'Copy branches',
     cm_copy_branch: 'Copy branch',
@@ -66,8 +66,19 @@ export const lang = {
     hk_copy_node_unformatted: 'Copy branch as plain text',
     hk_copy_node_without_subitems: 'Copy without subitems',
     cm_copy_link_to_block: 'Copy link to block',
+    toolbar_copy_search_results: 'Copy search results',
+    toolbar_copy_search_results_wo_subitems:
+        'Copy search results without sub-items',
+    toolbar_cut_search_results: 'Cut search results',
     hkg_clipboard: 'Clipboard',
-    hk_notice_copy: (
+    modals_snapshots_cut_card: 'Cut card ',
+    cm_cut: 'Cut branch',
+    hk_cut_node: 'Cut branch',
+    cm_paste: 'Paste',
+    hk_paste_node: 'Paste branch',
+    modals_snapshots_pasted_card: 'Pasted card ',
+    error_cant_paste: 'Paste command failed. Try pasting directly into a card',
+    /*hk_notice_copy: (
         size: number,
         formatted: boolean,
         type: 'branch' | 'section',
@@ -84,16 +95,7 @@ export const lang = {
             : size === 1
               ? null
               : size + ' sections copied to clipboard';
-    },
-
-    // cut paste
-    cm_cut: 'Cut branch',
-    hk_cut_node: 'Cut branch',
-    cm_paste: 'Paste',
-    hk_paste_node: 'Paste branch',
-    modals_snapshots_cut_card: 'Cut card ',
-    modals_snapshots_pasted_card: 'Pasted card ',
-    error_cant_paste: 'Paste command failed. Try pasting directly into a card',
+    },*/
 
     // merge
     cm_merge_above: 'Merge with branch above',

src/lib/tree-utils/sort/sort-node-ids-by-depth-desc.ts

@@ -0,0 +1,8 @@
+import { Sections } from 'src/stores/document/document-state-type';
+import { sortSectionsByDepthDesc } from 'src/helpers/sort-sections-by-depth';
+
+export const sortNodeIdsByDepthDesc = (sections: Sections, ids: string[]) => {
+    const sectionNumbers = ids.map((id) => sections.id_section[id]);
+    const sortedSections = sortSectionsByDepthDesc(sectionNumbers);
+    return sortedSections.map((section) => sections.section_id[section]);
+};

src/lib/tree-utils/sort/sort-node-ids-by-section-number.ts

@@ -0,0 +1,11 @@
+import { Sections } from 'src/stores/document/document-state-type';
+import { sortSections } from 'src/helpers/sort-sections';
+
+export const sortNodeIdsBySectionNumber = (
+    sections: Sections,
+    ids: string[],
+) => {
+    const pinnedSections = ids.map((id) => sections.id_section[id]);
+    const sortedSections = sortSections(pinnedSections);
+    return sortedSections.map((section) => sections.section_id[section]);
+};

src/stores/document/reducers/pinned-nodes/pin-node.ts

@@ -2,16 +2,7 @@ import {
     PinnedNodesState,
     Sections,
 } from 'src/stores/document/document-state-type';
-import { sortSections } from 'src/helpers/sort-sections';
-
-export const sortNodeIdsBySectionNumber = (
-    sections: Sections,
-    ids: string[],
-) => {
-    const pinnedSections = ids.map((id) => sections.id_section[id]);
-    const sortedSections = sortSections(pinnedSections);
-    return sortedSections.map((section) => sections.section_id[section]);
-};
+import { sortNodeIdsBySectionNumber } from 'src/lib/tree-utils/sort/sort-node-ids-by-section-number';
 
 export type PinNodeAction = {
     type: 'document/pinned-nodes/pin';

src/stores/document/reducers/pinned-nodes/remove-stale-pinned-nodes.ts

@@ -1,8 +1,9 @@
 import {
-    Sections,
     PinnedNodesState,
+    Sections,
 } from 'src/stores/document/document-state-type';
-import { sortNodeIdsBySectionNumber } from 'src/stores/document/reducers/pinned-nodes/pin-node';
+
+import { sortNodeIdsBySectionNumber } from 'src/lib/tree-utils/sort/sort-node-ids-by-section-number';
 
 export type RemoveStalePinnedNodesAction = {
     type: 'document/pinned-nodes/remove-stale-nodes';

src/stores/view/default-view-state.ts

@@ -6,7 +6,7 @@ export const defaultViewState = (): ViewState => ({
         results: new Map(),
         searching: false,
         showInput: false,
-        fuzzySearch: true,
+        fuzzySearch: false,
         showAllNodes: true,
     },
     ui: {

src/stores/view/subscriptions/actions/update-search-results.ts

@@ -31,11 +31,11 @@ export const updateSearchResults = debounce((view: LineageView) => {
         },
     });
 
-    const newSearchResults = Array.from(results).sort().join('');
+    const newSearchResults = Array.from(results.keys()).sort().join('');
     const previousSearchResults = Array.from(viewState.search.results.keys())
         .sort()
         .join('');
     if (previousSearchResults !== newSearchResults) {
         updateActiveNodeAfterSearch(view, Array.from(results.keys()));
     }
-}, 350);
+}, 100);

src/view/actions/keyboard-shortcuts/helpers/commands/commands/helpers/clipboard/copy-active-nodes-to-clipboard.ts

@@ -1,13 +1,11 @@
 import { LineageView } from 'src/view/view';
 import { getActiveNodes } from 'src/view/actions/keyboard-shortcuts/helpers/commands/commands/helpers/clipboard/get-active-nodes';
+import { copyNodesToClipboard } from 'src/view/actions/keyboard-shortcuts/helpers/commands/commands/helpers/clipboard/copy-nodes-to-clipboard';
 
 export const copyActiveNodesToClipboard = async (
     view: LineageView,
     isInSidebar: boolean,
 ) => {
     const nodes = getActiveNodes(view, isInSidebar);
-    const text = nodes
-        .map((id) => view.documentStore.getValue().document.content[id].content)
-        .join('\n\n');
-    await navigator.clipboard.writeText(text);
+    await copyNodesToClipboard(view, nodes);
 };

src/view/actions/keyboard-shortcuts/helpers/commands/commands/helpers/clipboard/copy-flat-search-results-to-clipboard.ts

@@ -0,0 +1,12 @@
+import { LineageView } from 'src/view/view';
+import { sortNodeIdsBySectionNumber } from 'src/lib/tree-utils/sort/sort-node-ids-by-section-number';
+import { copyNodesToClipboard } from 'src/view/actions/keyboard-shortcuts/helpers/commands/commands/helpers/clipboard/copy-nodes-to-clipboard';
+
+export const copyFlatSearchResultsToClipboard = async (view: LineageView) => {
+    const results = Array.from(view.viewStore.getValue().search.results.keys());
+    const sortedResults = sortNodeIdsBySectionNumber(
+        view.documentStore.getValue().sections,
+        results,
+    );
+    await copyNodesToClipboard(view, sortedResults, true);
+};