Skip to content

Commit

Permalink
Merge branch 'release/3.3.0' into develop
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/content-scripts/content_script/global.ts
  • Loading branch information
@poltak
poltak committed Dec 1, 2022
2 parents af2607c + d5912f1 commit f328db8
Show file tree
Hide file tree
Showing 104 changed files with 2,378 additions and 3,522 deletions.
2 changes: 1 addition & 1 deletion external/@worldbrain/memex-common
Submodule memex-common updated from 2e761f to 746805
38 changes: 19 additions & 19 deletions fonts/Inter/inter.css
View file
Original file line number Diff line number Diff line change
@@ -1,141 +1,141 @@
@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: normal;
font-weight: 100;
src: url('Inter-Thin.woff2') format('woff2'),
url('Inter-Thin.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: italic;
font-weight: 100;
src: url('Inter-ThinItalic.woff2') format('woff2'),
url('Inter-ThinItalic.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: normal;
font-weight: 200;
src: url('Inter-ExtraLight.woff2') format('woff2'),
url('Inter-ExtraLight.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: italic;
font-weight: 200;
src: url('Inter-ExtraLightItalic.woff2') format('woff2'),
url('Inter-ExtraLightItalic.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: normal;
font-weight: 300;
src: url('Inter-Light.woff2') format('woff2'),
url('Inter-Light.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: italic;
font-weight: 300;
src: url('Inter-LightItalic.woff2') format('woff2'),
url('Inter-LightItalic.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: normal;
font-weight: 400;
src: url('Inter-Regular.woff2') format('woff2'),
url('Inter-Regular.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: italic;
font-weight: 400;
src: url('Inter-Italic.woff2') format('woff2'),
url('Inter-Italic.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: normal;
font-weight: 500;
src: url('Inter-Medium.woff2') format('woff2'),
url('Inter-Medium.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: italic;
font-weight: 500;
src: url('Inter-MediumItalic.woff2') format('woff2'),
url('Inter-MediumItalic.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: normal;
font-weight: 600;
src: url('Inter-SemiBold.woff2') format('woff2'),
url('Inter-SemiBold.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: italic;
font-weight: 600;
src: url('Inter-SemiBoldItalic.woff2') format('woff2'),
url('Inter-SemiBoldItalic.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: normal;
font-weight: 700;
src: url('Inter-Bold.woff2') format('woff2'),
url('Inter-Bold.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: italic;
font-weight: 700;
src: url('Inter-BoldItalic.woff2') format('woff2'),
url('Inter-BoldItalic.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: normal;
font-weight: 800;
src: url('Inter-ExtraBold.woff2') format('woff2'),
url('Inter-ExtraBold.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: italic;
font-weight: 800;
src: url('Inter-ExtraBoldItalic.woff2') format('woff2'),
url('Inter-ExtraBoldItalic.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: normal;
font-weight: 900;
src: url('Inter-Black.woff2') format('woff2'),
url('Inter-Black.woff') format('woff');
}

@font-face {
font-family: 'Satoshi';
font-family: 'Inter';
font-style: italic;
font-weight: 900;
src: url('Inter-BlackItalic.woff2') format('woff2'),
Expand All @@ -146,7 +146,7 @@
Variable font.
Usage:
html { font-family: 'Satoshi', sans-serif; }
html { font-family: 'Inter', sans-serif; }
@supports (font-variation-settings: normal) {
html { font-family: 'Inter var', sans-serif; }
}
Expand Down
2 changes: 1 addition & 1 deletion img/file-pdf.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "worldbrain-extension",
"version": "3.2.27",
"version": "3.3.0",
"homepage": "https://worldbrain.io",
"repository": "https://github.com/WorldBrain/Memex",
"scripts": {
Expand Down Expand Up @@ -48,6 +48,7 @@
},
"dependencies": {
"@josephg/resolvable": "^1.0.0",
"@popperjs/core": "^2.11.6",
"@sentry/node": "^6.14.3",
"@styled-icons/feather": "^10.0.0",
"@styled-icons/styled-icon": "^10.0.0",
Expand Down Expand Up @@ -111,7 +112,7 @@
"polished": "^4.0.3",
"postcss-modules-values": "^2.0.0",
"promise-limit": "^2.5.0",
"prop-types": "^15.5.10",
"prop-types": "^15.8.1",
"qrcode": "^1.4.2",
"query-string": "^4.3.4",
"queue": "^5.0.0",
Expand All @@ -125,6 +126,7 @@
"react-helmet": "^5.2.1",
"react-markdown": "^5.0.0",
"react-onclickoutside": "^6.7.1",
"react-popper": "^2.3.0",
"react-redux": "^5.0.7",
"react-rnd": "^10.3.5",
"react-router": "^3.2.1",
Expand Down Expand Up @@ -309,4 +311,4 @@
},
"main": "index.js",
"author": "Oliver Sauter <oli@worldbrain.io>"
}
}
12 changes: 7 additions & 5 deletions src/activity-indicator/ui/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ export default class FeedActivityIndicator extends StatefulUIElement<
render() {
if (this.state.isShown) {
return (
<StaticListItem
listName="Feed"
unreadCount={this.state.hasFeedActivity ? 1 : 0}
onListItemClick={this.handleFeedIndicatorClick}
/>
<div>
<StaticListItem
listName="Feed"
unreadCount={this.state.hasFeedActivity ? 1 : 0}
onListItemClick={this.handleFeedIndicatorClick}
/>
</div>
)
}

Expand Down
13 changes: 0 additions & 13 deletions src/annotations/annotations-cache.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ export interface AnnotationsCacheInterface {
getAnnotationByRemoteId: (
remoteId: string | number,
) => CachedAnnotation | null
getListIdByRemoteId: (remoteId: string | number) => number
updateLists: (
args: ModifiedList & {
annotationId: string
Expand Down Expand Up @@ -369,18 +368,6 @@ export class AnnotationsCache implements AnnotationsCacheInterface {
getAnnotationByRemoteId = (remoteId: string | number): CachedAnnotation =>
this.annotations.find((annot) => annot.remoteId === remoteId) ?? null

getListIdByRemoteId = (remoteId: string | number): number => {
const knownLocalIds = Object.keys(this.listData).map(Number)
const matchingLocalId = knownLocalIds.find(
(localId) => this.listData[localId].remoteId === remoteId,
)
console.debug('Found localListId for remoteListId', {
localListId: matchingLocalId,
remoteListId: remoteId,
})
return matchingLocalId
}

setAnnotations: AnnotationsCacheInterface['setAnnotations'] = (
annotations,
) => {
Expand Down
Loading

0 comments on commit f328db8

Please sign in to comment.