From 200c0015374487e8cf4a69bd48218523d4c5756f Mon Sep 17 00:00:00 2001 From: Oliver Sauter Date: Mon, 26 Feb 2024 10:37:05 +0100 Subject: [PATCH 1/7] can't save a new template --- src/copy-paster/components/TemplateEditor.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/copy-paster/components/TemplateEditor.tsx b/src/copy-paster/components/TemplateEditor.tsx index 55501e439a..98b7823a63 100644 --- a/src/copy-paster/components/TemplateEditor.tsx +++ b/src/copy-paster/components/TemplateEditor.tsx @@ -256,7 +256,7 @@ export default class TemplateEditor extends PureComponent< : this.props.onClickCancel } /> - {!this.props.isNew && !this.isSaveDisabled && ( + {!this.isSaveDisabled && ( Date: Mon, 26 Feb 2024 11:22:19 +0100 Subject: [PATCH 2/7] Fix host pages pulling focus away from modal --- external/@worldbrain/memex-common | 2 +- src/dashboard-refactor/index.tsx | 4 ++-- .../search-results/components/page-result.tsx | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common index ec31f6a6e6..93df0827bf 160000 --- a/external/@worldbrain/memex-common +++ b/external/@worldbrain/memex-common @@ -1 +1 @@ -Subproject commit ec31f6a6e622e1c5a67ca0d77556ba794af76329 +Subproject commit 93df0827bfe33a57a723453e6db4f54f29e3c48a diff --git a/src/dashboard-refactor/index.tsx b/src/dashboard-refactor/index.tsx index 8b9181cf6c..f32c846b9d 100644 --- a/src/dashboard-refactor/index.tsx +++ b/src/dashboard-refactor/index.tsx @@ -176,6 +176,8 @@ export class DashboardContainer extends StatefulUIElement< handleChangeFocusItem = (event: KeyboardEvent) => { const getPopoutBoxes = document.getElementById('popout-boxes') if (!getPopoutBoxes) { + event.stopPropagation() + event.preventDefault() if ( event.key === 'Escape' && this.props.inPageMode && @@ -198,8 +200,6 @@ export class DashboardContainer extends StatefulUIElement< this.processEvent('changeFocusItem', { direction: event.key === 'ArrowUp' ? 'up' : 'down', }) - event.stopPropagation() - event.preventDefault() } } } diff --git a/src/dashboard-refactor/search-results/components/page-result.tsx b/src/dashboard-refactor/search-results/components/page-result.tsx index d357bde49b..85f792ce25 100644 --- a/src/dashboard-refactor/search-results/components/page-result.tsx +++ b/src/dashboard-refactor/search-results/components/page-result.tsx @@ -99,7 +99,6 @@ export default class PageResultView extends PureComponent { if (this.props.isInFocus && !prevProps.isInFocus) { this.setupKeyListener() const itemBox = this.itemBoxRef.current - const resultBox = this.props.resultsRef.current if (itemBox && !this.props.hoverState) { itemBox.scrollIntoView({ block: 'center' }) } From 6a88f39d600c4296655208fb416347ca780f8cd6 Mon Sep 17 00:00:00 2001 From: Oliver Sauter Date: Mon, 26 Feb 2024 12:26:23 +0100 Subject: [PATCH 3/7] Also cover cases for Google Docs capturing the focus and make it more robust in general --- external/@worldbrain/memex-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common index 93df0827bf..ab9815265b 160000 --- a/external/@worldbrain/memex-common +++ b/external/@worldbrain/memex-common @@ -1 +1 @@ -Subproject commit 93df0827bfe33a57a723453e6db4f54f29e3c48a +Subproject commit ab9815265bc7dda3ef6e585c17d24875c3be8577 From b168e47239a971723b3635fb20bf3bacc12dde94 Mon Sep 17 00:00:00 2001 From: Oliver Sauter Date: Mon, 26 Feb 2024 12:26:58 +0100 Subject: [PATCH 4/7] bump version to 3.13.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b0512a3ef..df029fb81a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "worldbrain-extension", - "version": "3.13.1", + "version": "3.13.2", "homepage": "https://memex.garden", "repository": "https://github.com/WorldBrain/Memex", "scripts": { From b7e969304ff1588ef8bb74b926ce3ccb55dd4381 Mon Sep 17 00:00:00 2001 From: Oliver Sauter Date: Mon, 26 Feb 2024 12:53:36 +0100 Subject: [PATCH 5/7] make sure to still allow defaults of other key presses --- external/@worldbrain/memex-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common index ab9815265b..de0c67299a 160000 --- a/external/@worldbrain/memex-common +++ b/external/@worldbrain/memex-common @@ -1 +1 @@ -Subproject commit ab9815265bc7dda3ef6e585c17d24875c3be8577 +Subproject commit de0c67299ac0a732ae03a8938727de370935e710 From 9fc32fb184e206e1347c4849600b9f532eaa4e59 Mon Sep 17 00:00:00 2001 From: Oliver Sauter Date: Mon, 26 Feb 2024 12:53:51 +0100 Subject: [PATCH 6/7] make sure to allow keypress defaults --- src/dashboard-refactor/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dashboard-refactor/index.tsx b/src/dashboard-refactor/index.tsx index f32c846b9d..39b170f25c 100644 --- a/src/dashboard-refactor/index.tsx +++ b/src/dashboard-refactor/index.tsx @@ -176,8 +176,6 @@ export class DashboardContainer extends StatefulUIElement< handleChangeFocusItem = (event: KeyboardEvent) => { const getPopoutBoxes = document.getElementById('popout-boxes') if (!getPopoutBoxes) { - event.stopPropagation() - event.preventDefault() if ( event.key === 'Escape' && this.props.inPageMode && @@ -189,6 +187,8 @@ export class DashboardContainer extends StatefulUIElement< } if (event.key === 'ArrowUp' || event.key === 'ArrowDown') { + event.stopPropagation() + event.preventDefault() if (!this.state.focusLockUntilMouseStart) { document.addEventListener('mousemove', this.releaseLock, { once: true, From 67ca02a787056cb9cbc2dbbc9d95f2d6f267f06f Mon Sep 17 00:00:00 2001 From: Oliver Sauter Date: Mon, 26 Feb 2024 14:37:27 +0100 Subject: [PATCH 7/7] fix default order of templates --- src/copy-paster/background/default-templates.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/copy-paster/background/default-templates.ts b/src/copy-paster/background/default-templates.ts index 5192fcf827..fe354d40b7 100644 --- a/src/copy-paster/background/default-templates.ts +++ b/src/copy-paster/background/default-templates.ts @@ -3,6 +3,7 @@ import { Storage } from 'webextension-polyfill' import { Template } from '../types' import CopyPasterBackground from '.' import { ImageSupportInterface } from 'src/image-support/background/types' +import { DEFAULT_SPACE_BETWEEN } from '@worldbrain/memex-common/lib/utils/item-ordering' export const PERFORMED_STORAGE_FLAG = '@TextExport-default_templates_inserted_1' @@ -10,7 +11,7 @@ export const JUST_URL: Template = { id: 1, title: 'Page URL', isFavourite: false, - order: 1000000000, + order: DEFAULT_SPACE_BETWEEN * 1, outputFormat: 'markdown', code: `{{{PageUrl}}}`, } @@ -19,7 +20,7 @@ export const URL_AND_TITLE: Template = { id: 2, title: 'Page URL & Title', isFavourite: false, - order: 2000000000, + order: DEFAULT_SPACE_BETWEEN * 2, outputFormat: 'markdown', code: `{{{PageTitle}}} {{{PageUrl}}}`, @@ -29,7 +30,7 @@ export const ROAM_MD_TEMPLATE: Template = { id: 3, title: 'Roam Template', isFavourite: false, - order: 3000000000, + order: DEFAULT_SPACE_BETWEEN * 3, outputFormat: 'rich-text', code: `[[{{{PageTitle}}}]] - url:: {{{PageUrl}}} @@ -57,7 +58,7 @@ export const TANA_PASTE_TEMPLATE: Template = { id: 4, title: 'Tana Paste Template', isFavourite: false, - order: 4000000000, + order: DEFAULT_SPACE_BETWEEN * 4, outputFormat: 'markdown', code: `%%tana%% - {{{PageTitle}}} @@ -83,7 +84,7 @@ export const NOTION_MD_TEMPLATE: Template = { id: 5, title: 'Notion Template', isFavourite: false, - order: 5000000000, + order: DEFAULT_SPACE_BETWEEN * 5, outputFormat: 'markdown', code: ` [{{{PageTitle}}}]({{{PageUrl}}}) @@ -110,7 +111,7 @@ export const OBSIDIAN_MD_TEMPLATE: Template = { id: 6, title: 'Obsidian Template', isFavourite: false, - order: 6000000000, + order: DEFAULT_SPACE_BETWEEN * 6, outputFormat: 'rich-text', code: ` - [[{{{PageTitle}}}]] @@ -138,7 +139,7 @@ export const LOGSEQ_MD_TEMPLATE: Template = { id: 7, title: 'Logseq Template', isFavourite: false, - order: 7000000000, + order: DEFAULT_SPACE_BETWEEN * 7, outputFormat: 'markdown', code: `[[{{{PageTitle}}}]] - url:: {{{PageUrl}}} @@ -166,7 +167,7 @@ export const HTML_TEMPLATE: Template = { id: 8, title: 'HTML', isFavourite: false, - order: 8000000000, + order: DEFAULT_SPACE_BETWEEN * 8, outputFormat: 'markdown', code: `{{{PageTitle}}}