From 08ecdfe1f30f3aa0dfaafcab443d84d15bf8b8c3 Mon Sep 17 00:00:00 2001 From: Oliver Sauter Date: Tue, 27 Feb 2024 22:52:27 +0100 Subject: [PATCH 1/4] make sure to have the proper font in the in page injectsons --- 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 a00eccf898..65730d3033 160000 --- a/external/@worldbrain/memex-common +++ b/external/@worldbrain/memex-common @@ -1 +1 @@ -Subproject commit a00eccf89827042707ff410b6f4727c1b92c540a +Subproject commit 65730d3033a7531920d635d4a02a8cbcfdce69ad From 60811b5e1636b053bda068f096764ccda5816155 Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 28 Feb 2024 08:33:00 +0100 Subject: [PATCH 2/4] Fix bug where deleting items does not reduce the inbox counter --- src/dashboard-refactor/logic.ts | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/dashboard-refactor/logic.ts b/src/dashboard-refactor/logic.ts index 881f5d1a5c..ead0543c1f 100644 --- a/src/dashboard-refactor/logic.ts +++ b/src/dashboard-refactor/logic.ts @@ -1576,6 +1576,21 @@ export class DashboardLogic extends UILogic { previousState, }) => { if (event.instaDelete) { + const pageLists = + previousState.searchResults.pageData.byId[event.pageId].lists + const isPageInInbox = pageLists.some( + (listId) => + this.options.annotationsCache.lists.byId[listId].localId === + SPECIAL_LIST_IDS.INBOX, + ) + + if (isPageInInbox) { + this.emitMutation({ + listsSidebar: { + inboxUnreadCount: { $apply: (count) => count - 1 }, + }, + }) + } await executeUITask( this, (taskState) => ({ @@ -1808,6 +1823,20 @@ export class DashboardLogic extends UILogic { const { pageId, day } = modals.deletingPageArgs + const pageLists = pageData.byId[pageId].lists + const isPageInInbox = pageLists.some( + (listId) => + this.options.annotationsCache.lists.byId[listId].localId === + SPECIAL_LIST_IDS.INBOX, + ) + + if (isPageInInbox) { + this.emitMutation({ + listsSidebar: { + inboxUnreadCount: { $apply: (count) => count - 1 }, + }, + }) + } await executeUITask( this, (taskState) => ({ From 5b677486f5efadfa715815a7a2ac5a8a5c9609eb Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 28 Feb 2024 09:14:44 +0100 Subject: [PATCH 3/4] Fixing overlay font styles --- src/common-ui/components/Overlay.tsx | 5 +++++ .../search-results/components/page-result.tsx | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/common-ui/components/Overlay.tsx b/src/common-ui/components/Overlay.tsx index 1f2df6fdaa..95def47dc4 100644 --- a/src/common-ui/components/Overlay.tsx +++ b/src/common-ui/components/Overlay.tsx @@ -111,6 +111,11 @@ export const OuterDiv = styled.div` cursor: ${(props) => (props.onClick ? 'pointer' : 'default')}; justify-content: center; align-items: center; + + * { + font-family: 'Satoshi', sans-serif; + font-feature-settings: 'pnum' on, 'lnum' on, 'case' on, 'ss03' on; + } ` export const InnerDiv = styled.div<{ large: boolean }>` diff --git a/src/dashboard-refactor/search-results/components/page-result.tsx b/src/dashboard-refactor/search-results/components/page-result.tsx index 519c39f8dc..4eeed12947 100644 --- a/src/dashboard-refactor/search-results/components/page-result.tsx +++ b/src/dashboard-refactor/search-results/components/page-result.tsx @@ -765,9 +765,13 @@ export default class PageResultView extends PureComponent { let instaDelete = false if (event.shiftKey) { + event.preventDefault() + event.stopPropagation() instaDelete = true } this.props.onTrashBtnClick(instaDelete) + event.preventDefault() + event.stopPropagation() }} /> From 592e927685bcd4dc996ce5ebbb4a05c296d75ba1 Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 28 Feb 2024 09:19:29 +0100 Subject: [PATCH 4/4] bump version to 3.13.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c239516c36..107055f408 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "worldbrain-extension", - "version": "3.13.6", + "version": "3.13.7", "homepage": "https://memex.garden", "repository": "https://github.com/WorldBrain/Memex", "scripts": {