Make it so that shift+backspace removes item from current list

WorldBrain · Feb 28, 2024 · f26a09c · f26a09c
1 parent 1eec4b6
commit f26a09c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common
diff --git a/src/dashboard-refactor/logic.ts b/src/dashboard-refactor/logic.ts
@@ -1715,6 +1715,11 @@ export class DashboardLogic extends UILogic<State, Events> {
         if (previousState.listsSidebar.selectedListId == null) {
             throw new Error('No list is currently filtered to remove page from')
         }
+        this.processUIEvent('changeFocusItem', {
+            previousState,
+            event: { direction: 'down', pageId: event.pageId },
+        })
+
         const listData = getListData(
             previousState.listsSidebar.selectedListId,
             previousState,

diff --git a/src/dashboard-refactor/search-results/components/page-result.tsx b/src/dashboard-refactor/search-results/components/page-result.tsx
@@ -190,30 +190,40 @@ export default class PageResultView extends PureComponent<Props> {
                     break
                     break
                 case 'Enter':
+                    if (this.props.editTitleState != null) {
+                        if (event.shiftKey) {
+                            event.stopPropagation()
+                            // Perform action for "shift+Enter" key
+                            const itemData = {
+                                url: this.props.normalizedUrl,
+                                title: this.props.fullTitle,
+                                type: 'page',
+                            }
+                            if (this.props.isBulkSelected) {
+                                this.props.selectItem(itemData, true)
+                            } else {
+                                this.props.selectItem(itemData, false)
+                            }
+                        } else {
+                            // Perform action for "Enter" key
+                            event.stopPropagation()
+                            this.props.onClick(event as any)
+                            break
+                        }
+                    }
+                    break
+                case 'Backspace':
                     if (event.shiftKey) {
                         event.stopPropagation()
                         // Perform action for "shift+Enter" key
-                        const itemData = {
-                            url: this.props.normalizedUrl,
-                            title: this.props.fullTitle,
-                            type: 'page',
-                        }
-                        if (this.props.isBulkSelected) {
-                            this.props.selectItem(itemData, true)
-                        } else {
-                            this.props.selectItem(itemData, false)
-                        }
+                        this.props.onRemoveFromListBtnClick(event as any)
                     } else {
                         // Perform action for "Enter" key
                         event.stopPropagation()
-                        this.props.onClick(event as any)
+                        this.props.onTrashBtnClick(event as any)
                         break
                     }
-                    break
-                case 'Backspace':
                     // Perform action for "Backspace" key
-                    this.props.onTrashBtnClick(event as any)
-                    break
                     break
                 default:
                     break