chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].1

.github/workflows/publish.yml

@@ -67,9 +67,9 @@ jobs:
         uses: convictional/trigger-workflow-and-wait@master
         with:
           owner: standardnotes
-          repo: self-hosted
+          repo: server
           github_token: ${{ secrets.CI_PAT_TOKEN }}
-          workflow_file_name: testing-with-updating-client-and-server.yml
+          workflow_file_name: e2e-test-suite.yml
           wait_interval: 30
           client_payload: '{"snjs_image_tag": "${{ github.sha }}"}'
           propagate_failure: true

.github/workflows/snjs.pr.yml

@@ -43,9 +43,9 @@ jobs:
         uses: convictional/trigger-workflow-and-wait@master
         with:
           owner: standardnotes
-          repo: self-hosted
+          repo: server
           github_token: ${{ secrets.CI_PAT_TOKEN }}
-          workflow_file_name: testing-with-updating-client-and-server.yml
+          workflow_file_name: e2e-test-suite.yml
           wait_interval: 30
           client_payload: '{"snjs_image_tag": "${{ github.sha }}"}'
           propagate_failure: true

packages/api/CHANGELOG.md

@@ -3,6 +3,70 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.25.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-03)
+
+### Features
+
+* **dev:** add u2f ui for managing devices and signing in ([#2182](https://github.com/standardnotes/app/issues/2182)) ([9414774](https://github.com/standardnotes/app/commit/9414774e89c5c21b0c2178652ded72033065e8d2))
+
+## [1.24.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-02)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-31)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-31)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-24)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-24)
+
+### Bug Fixes
+
+* **api:** add u2f required error tag ([9bdda2b](https://github.com/standardnotes/app/commit/9bdda2b60a2a85d32b0896dc6e307d27b76d42a8))
+
+## [1.24.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-21)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.24.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-19)
 
 **Note:** Version bump only for package @standardnotes/api

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.24.2",
+  "version": "1.25.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -36,7 +36,7 @@
     "typescript": "*"
   },
   "dependencies": {
-    "@standardnotes/common": "^1.46.3",
+    "@standardnotes/common": "^1.46.4",
     "@standardnotes/domain-core": "^1.11.1",
     "@standardnotes/encryption": "workspace:*",
     "@standardnotes/models": "workspace:*",

packages/api/src/Domain/Client/Authenticator/AuthenticatorApiOperations.ts

@@ -4,5 +4,4 @@ export enum AuthenticatorApiOperations {
   GenerateRegistrationOptions,
   GenerateAuthenticationOptions,
   VerifyRegistrationResponse,
-  VerifyAuthenticationResponse,
 }

packages/api/src/Domain/Client/Authenticator/AuthenticatorApiService.ts

@@ -9,7 +9,6 @@ import {
   GenerateAuthenticatorRegistrationOptionsResponse,
   VerifyAuthenticatorRegistrationResponseResponse,
   GenerateAuthenticatorAuthenticationOptionsResponse,
-  VerifyAuthenticatorAuthenticationResponseResponse,
 } from '../../Response'
 import { AuthenticatorServerInterface } from '../../Server/Authenticator/AuthenticatorServerInterface'
 
@@ -79,7 +78,7 @@ export class AuthenticatorApiService implements AuthenticatorApiServiceInterface
   async verifyRegistrationResponse(
     userUuid: string,
     name: string,
-    registrationCredential: Record<string, unknown>,
+    attestationResponse: Record<string, unknown>,
   ): Promise<VerifyAuthenticatorRegistrationResponseResponse> {
     if (this.operationsInProgress.get(AuthenticatorApiOperations.VerifyRegistrationResponse)) {
       throw new ApiCallError(ErrorMessage.GenericInProgress)
@@ -91,7 +90,7 @@ export class AuthenticatorApiService implements AuthenticatorApiServiceInterface
       const response = await this.authenticatorServer.verifyRegistrationResponse({
         userUuid,
         name,
-        registrationCredential,
+        attestationResponse,
       })
 
       return response
@@ -102,7 +101,7 @@ export class AuthenticatorApiService implements AuthenticatorApiServiceInterface
     }
   }
 
-  async generateAuthenticationOptions(): Promise<GenerateAuthenticatorAuthenticationOptionsResponse> {
+  async generateAuthenticationOptions(username: string): Promise<GenerateAuthenticatorAuthenticationOptionsResponse> {
     if (this.operationsInProgress.get(AuthenticatorApiOperations.GenerateAuthenticationOptions)) {
       throw new ApiCallError(ErrorMessage.GenericInProgress)
     }
@@ -110,7 +109,9 @@ export class AuthenticatorApiService implements AuthenticatorApiServiceInterface
     this.operationsInProgress.set(AuthenticatorApiOperations.GenerateAuthenticationOptions, true)
 
     try {
-      const response = await this.authenticatorServer.generateAuthenticationOptions()
+      const response = await this.authenticatorServer.generateAuthenticationOptions({
+        username,
+      })
 
       return response
     } catch (error) {
@@ -119,28 +120,4 @@ export class AuthenticatorApiService implements AuthenticatorApiServiceInterface
       this.operationsInProgress.set(AuthenticatorApiOperations.GenerateAuthenticationOptions, false)
     }
   }
-
-  async verifyAuthenticationResponse(
-    userUuid: string,
-    authenticationCredential: Record<string, unknown>,
-  ): Promise<VerifyAuthenticatorAuthenticationResponseResponse> {
-    if (this.operationsInProgress.get(AuthenticatorApiOperations.VerifyAuthenticationResponse)) {
-      throw new ApiCallError(ErrorMessage.GenericInProgress)
-    }
-
-    this.operationsInProgress.set(AuthenticatorApiOperations.VerifyAuthenticationResponse, true)
-
-    try {
-      const response = await this.authenticatorServer.verifyAuthenticationResponse({
-        authenticationCredential,
-        userUuid,
-      })
-
-      return response
-    } catch (error) {
-      throw new ApiCallError(ErrorMessage.GenericFail)
-    } finally {
-      this.operationsInProgress.set(AuthenticatorApiOperations.VerifyAuthenticationResponse, false)
-    }
-  }
 }

packages/api/src/Domain/Client/Authenticator/AuthenticatorApiServiceInterface.ts

@@ -4,7 +4,6 @@ import {
   GenerateAuthenticatorRegistrationOptionsResponse,
   VerifyAuthenticatorRegistrationResponseResponse,
   GenerateAuthenticatorAuthenticationOptionsResponse,
-  VerifyAuthenticatorAuthenticationResponseResponse,
 } from '../../Response'
 
 export interface AuthenticatorApiServiceInterface {
@@ -14,11 +13,7 @@ export interface AuthenticatorApiServiceInterface {
   verifyRegistrationResponse(
     userUuid: string,
     name: string,
-    registrationCredential: Record<string, unknown>,
+    attestationResponse: Record<string, unknown>,
   ): Promise<VerifyAuthenticatorRegistrationResponseResponse>
-  generateAuthenticationOptions(): Promise<GenerateAuthenticatorAuthenticationOptionsResponse>
-  verifyAuthenticationResponse(
-    userUuid: string,
-    authenticationCredential: Record<string, unknown>,
-  ): Promise<VerifyAuthenticatorAuthenticationResponseResponse>
+  generateAuthenticationOptions(username: string): Promise<GenerateAuthenticatorAuthenticationOptionsResponse>
 }

packages/api/src/Domain/Http/ErrorTag.ts

@@ -1,6 +1,7 @@
 export enum ErrorTag {
   MfaInvalid = 'mfa-invalid',
   MfaRequired = 'mfa-required',
+  U2FRequired = 'u2f-required',
   RefreshTokenInvalid = 'invalid-refresh-token',
   RefreshTokenExpired = 'expired-refresh-token',
   AccessTokenExpired = 'expired-access-token',

packages/api/src/Domain/Request/Authenticator/GenerateAuthenticatorAuthenticationOptionsRequestParams.ts

@@ -0,0 +1,3 @@
+export interface GenerateAuthenticatorAuthenticationOptionsRequestParams {
+  username: string
+}

packages/api/src/Domain/Request/Authenticator/VerifyAuthenticatorAuthenticationResponseRequestParams.ts

@@ -1,5 +0,0 @@
-export interface VerifyAuthenticatorAuthenticationResponseRequestParams {
-  userUuid: string
-  authenticationCredential: Record<string, unknown>
-  [additionalParam: string]: unknown
-}

packages/api/src/Domain/Request/Authenticator/VerifyAuthenticatorRegistrationResponseRequestParams.ts

@@ -1,6 +1,6 @@
 export interface VerifyAuthenticatorRegistrationResponseRequestParams {
   userUuid: string
   name: string
-  registrationCredential: Record<string, unknown>
+  attestationResponse: Record<string, unknown>
   [additionalParam: string]: unknown
 }

packages/api/src/Domain/Request/index.ts

@@ -1,7 +1,7 @@
 export * from './ApiEndpointParam'
 export * from './Authenticator/DeleteAuthenticatorRequestParams'
+export * from './Authenticator/GenerateAuthenticatorAuthenticationOptionsRequestParams'
 export * from './Authenticator/ListAuthenticatorsRequestParams'
-export * from './Authenticator/VerifyAuthenticatorAuthenticationResponseRequestParams'
 export * from './Authenticator/VerifyAuthenticatorRegistrationResponseRequestParams'
 export * from './Recovery/RecoveryKeyParamsRequestParams'
 export * from './Recovery/SignInWithRecoveryCodesRequestParams'

packages/api/src/Domain/Response/Authenticator/VerifyAuthenticatorAuthenticationResponseResponse.ts

@@ -1,10 +0,0 @@
-import { Either } from '@standardnotes/common'
-
-import { HttpErrorResponseBody } from '../../Http/HttpErrorResponseBody'
-import { HttpResponse } from '../../Http/HttpResponse'
-
-import { VerifyAuthenticatorAuthenticationResponseResponseBody } from './VerifyAuthenticatorAuthenticationResponseResponseBody'
-
-export interface VerifyAuthenticatorAuthenticationResponseResponse extends HttpResponse {
-  data: Either<VerifyAuthenticatorAuthenticationResponseResponseBody, HttpErrorResponseBody>
-}

packages/api/src/Domain/Response/Authenticator/VerifyAuthenticatorAuthenticationResponseResponseBody.ts

@@ -1,3 +0,0 @@
-export interface VerifyAuthenticatorAuthenticationResponseResponseBody {
-  success: boolean
-}

packages/api/src/Domain/Response/index.ts

@@ -8,8 +8,6 @@ export * from './Authenticator/GenerateAuthenticatorRegistrationOptionsResponse'
 export * from './Authenticator/GenerateAuthenticatorRegistrationOptionsResponseBody'
 export * from './Authenticator/ListAuthenticatorsResponse'
 export * from './Authenticator/ListAuthenticatorsResponseBody'
-export * from './Authenticator/VerifyAuthenticatorAuthenticationResponseResponse'
-export * from './Authenticator/VerifyAuthenticatorAuthenticationResponseResponseBody'
 export * from './Authenticator/VerifyAuthenticatorRegistrationResponseResponse'
 export * from './Authenticator/VerifyAuthenticatorRegistrationResponseResponseBody'
 export * from './Recovery/GenerateRecoveryCodesResponse'

packages/api/src/Domain/Server/Authenticator/AuthenticatorServer.ts

@@ -1,9 +1,9 @@
 import { HttpServiceInterface } from '../../Http/HttpServiceInterface'
 import {
   ListAuthenticatorsRequestParams,
+  GenerateAuthenticatorAuthenticationOptionsRequestParams,
   DeleteAuthenticatorRequestParams,
   VerifyAuthenticatorRegistrationResponseRequestParams,
-  VerifyAuthenticatorAuthenticationResponseRequestParams,
 } from '../../Request'
 import {
   ListAuthenticatorsResponse,
@@ -11,7 +11,6 @@ import {
   GenerateAuthenticatorRegistrationOptionsResponse,
   VerifyAuthenticatorRegistrationResponseResponse,
   GenerateAuthenticatorAuthenticationOptionsResponse,
-  VerifyAuthenticatorAuthenticationResponseResponse,
 } from '../../Response'
 import { AuthenticatorServerInterface } from './AuthenticatorServerInterface'
 import { Paths } from './Paths'
@@ -45,17 +44,11 @@ export class AuthenticatorServer implements AuthenticatorServerInterface {
     return response as VerifyAuthenticatorRegistrationResponseResponse
   }
 
-  async generateAuthenticationOptions(): Promise<GenerateAuthenticatorAuthenticationOptionsResponse> {
-    const response = await this.httpService.get(Paths.v1.generateAuthenticationOptions)
+  async generateAuthenticationOptions(
+    params: GenerateAuthenticatorAuthenticationOptionsRequestParams,
+  ): Promise<GenerateAuthenticatorAuthenticationOptionsResponse> {
+    const response = await this.httpService.post(Paths.v1.generateAuthenticationOptions, params)
 
     return response as GenerateAuthenticatorAuthenticationOptionsResponse
   }
-
-  async verifyAuthenticationResponse(
-    params: VerifyAuthenticatorAuthenticationResponseRequestParams,
-  ): Promise<VerifyAuthenticatorAuthenticationResponseResponse> {
-    const response = await this.httpService.post(Paths.v1.verifyAuthenticationResponse, params)
-
-    return response as VerifyAuthenticatorAuthenticationResponseResponse
-  }
 }

packages/api/src/Domain/Server/Authenticator/AuthenticatorServerInterface.ts

@@ -2,7 +2,7 @@ import {
   ListAuthenticatorsRequestParams,
   DeleteAuthenticatorRequestParams,
   VerifyAuthenticatorRegistrationResponseRequestParams,
-  VerifyAuthenticatorAuthenticationResponseRequestParams,
+  GenerateAuthenticatorAuthenticationOptionsRequestParams,
 } from '../../Request'
 import {
   ListAuthenticatorsResponse,
@@ -10,7 +10,6 @@ import {
   GenerateAuthenticatorRegistrationOptionsResponse,
   VerifyAuthenticatorRegistrationResponseResponse,
   GenerateAuthenticatorAuthenticationOptionsResponse,
-  VerifyAuthenticatorAuthenticationResponseResponse,
 } from '../../Response'
 
 export interface AuthenticatorServerInterface {
@@ -20,8 +19,7 @@ export interface AuthenticatorServerInterface {
   verifyRegistrationResponse(
     params: VerifyAuthenticatorRegistrationResponseRequestParams,
   ): Promise<VerifyAuthenticatorRegistrationResponseResponse>
-  generateAuthenticationOptions(): Promise<GenerateAuthenticatorAuthenticationOptionsResponse>
-  verifyAuthenticationResponse(
-    params: VerifyAuthenticatorAuthenticationResponseRequestParams,
-  ): Promise<VerifyAuthenticatorAuthenticationResponseResponse>
+  generateAuthenticationOptions(
+    params: GenerateAuthenticatorAuthenticationOptionsRequestParams,
+  ): Promise<GenerateAuthenticatorAuthenticationOptionsResponse>
 }

packages/api/src/Domain/Server/Authenticator/Paths.ts

@@ -4,7 +4,6 @@ const AuthenticatorPaths = {
   generateRegistrationOptions: '/v1/authenticators/generate-registration-options',
   verifyRegistrationResponse: '/v1/authenticators/verify-registration',
   generateAuthenticationOptions: '/v1/authenticators/generate-authentication-options',
-  verifyAuthenticationResponse: '/v1/authenticators/verify-authentication',
 }
 
 export const Paths = {

packages/blocks-editor/CHANGELOG.md

@@ -3,6 +3,76 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.16.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-10)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+## [1.16.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-09)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+## [1.16.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-09)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+## [1.16.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-09)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+## [1.16.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-07)
+
+### Bug Fixes
+
+* Fixed issue in Super notes where collapsible block title alignment would not persist ([461551f](https://github.com/standardnotes/app/commit/461551fdf7083c5b29b84de80233de049f16f44d))
+
+## [1.16.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-03)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+## [1.16.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-02)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+## [1.16.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+## [1.16.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+### Bug Fixes
+
+* Fixed issue where converting to Super would result in empty note ([cf4e348](https://github.com/standardnotes/app/commit/cf4e34858fcb898199ed102194d2d068c7d1d2db))
+
+## [1.16.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+## [1.16.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+# [1.16.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+### Features
+
+* Added above-keyboard toolbar to Super notes on mobile for formatting & selecting blocks ([#2189](https://github.com/standardnotes/app/issues/2189)) ([4a3f9f1](https://github.com/standardnotes/app/commit/4a3f9f12e7742e162f330b3c90810aa8ce110fc8))
+
+# [1.15.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-31)
+
+### Features
+
+* Changed floating toolbar in Super to be always visible above keyboard on mobile ([#2188](https://github.com/standardnotes/app/issues/2188)) ([ba67f8b](https://github.com/standardnotes/app/commit/ba67f8b8ce664d79a4374b6d36003db8789e5de0))
+
+## [1.14.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-25)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+# [1.14.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-25)
+
+### Features
+
+* Links in Super notes will get auto-linked when they're pasted or typed ([1b696fa](https://github.com/standardnotes/app/commit/1b696fa50440bf5ff6f0a3a92ba9c2a775e374d6))
+
 # [1.13.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-12)
 
 ### Features

packages/blocks-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/blocks-editor",
-  "version": "1.13.0",
+  "version": "1.16.11",
   "private": true,
   "main": "./src/index.ts",
   "scripts": {
@@ -9,11 +9,11 @@
     "lint:fix": "eslint src/ --fix"
   },
   "dependencies": {
-    "@lexical/react": "0.7.6",
+    "@lexical/react": "0.8.0",
     "@standardnotes/icons": "workspace:*",
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.9",
-    "lexical": "0.7.6",
+    "lexical": "0.8.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

packages/blocks-editor/src/Editor/BlocksEditor.tsx

@@ -11,7 +11,7 @@ import { HashtagPlugin } from '@lexical/react/LexicalHashtagPlugin'
 import { HistoryPlugin } from '@lexical/react/LexicalHistoryPlugin'
 import { LinkPlugin } from '@lexical/react/LexicalLinkPlugin'
 import { ListPlugin } from '@lexical/react/LexicalListPlugin'
-import { $getRoot, EditorState, LexicalEditor } from 'lexical'
+import { EditorState, LexicalEditor } from 'lexical'
 import HorizontalRulePlugin from '../Lexical/Plugins/HorizontalRulePlugin'
 import TwitterPlugin from '../Lexical/Plugins/TwitterPlugin'
 import YouTubePlugin from '../Lexical/Plugins/YouTubePlugin'
@@ -22,7 +22,7 @@ import CodeHighlightPlugin from '../Lexical/Plugins/CodeHighlightPlugin'
 import FloatingTextFormatToolbarPlugin from '../Lexical/Plugins/FloatingTextFormatToolbarPlugin'
 import FloatingLinkEditorPlugin from '../Lexical/Plugins/FloatingLinkEditorPlugin'
 import { TabIndentationPlugin } from '../Lexical/Plugins/TabIndentationPlugin'
-import { truncateString } from './Utils'
+import { handleEditorChange } from './Utils'
 import { SuperEditorContentId } from './Constants'
 import { classNames } from '@standardnotes/utils'
 import { MarkdownTransformers } from './MarkdownTransformers'
@@ -55,27 +55,7 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
       }
 
       editorState.read(() => {
-        const childrenNodes = $getRoot().getAllTextNodes().slice(0, 2)
-        let previewText = ''
-        childrenNodes.forEach((node, index) => {
-          previewText += node.getTextContent()
-          if (index !== childrenNodes.length - 1) {
-            previewText += '\n'
-          }
-        })
-
-        if (previewLength) {
-          previewText = truncateString(previewText, previewLength)
-        }
-
-        try {
-          const stringifiedEditorState = JSON.stringify(editorState.toJSON())
-          onChange?.(stringifiedEditorState, previewText)
-        } catch (error) {
-          window.alert(
-            `An invalid change was made inside the Super editor. Your change was not saved. Please report this error to the team: ${error}`,
-          )
-        }
+        handleEditorChange(editorState, previewLength, onChange)
       })
     },
     // Ignoring 'ignoreFirstChange' and 'previewLength'
@@ -93,10 +73,9 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
 
   return (
     <>
-      {children}
       <RichTextPlugin
         contentEditable={
-          <div id="blocks-editor" className="editor-scroller h-full">
+          <div id="blocks-editor" className="editor-scroller h-full min-h-0">
             <div className="editor z-0 overflow-hidden" ref={onRef}>
               <ContentEditable
                 id={SuperEditorContentId}
@@ -133,6 +112,7 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
           <DraggableBlockPlugin anchorElem={floatingAnchorElem} />
         </>
       )}
+      {children}
     </>
   )
 }

packages/blocks-editor/src/Editor/Utils.ts

@@ -1,3 +1,5 @@
+import { $getRoot, EditorState } from 'lexical'
+
 export function truncateString(string: string, limit: number) {
   if (string.length <= limit) {
     return string
@@ -5,3 +7,31 @@ export function truncateString(string: string, limit: number) {
     return string.substring(0, limit) + '...'
   }
 }
+
+export function handleEditorChange(
+  editorState: EditorState,
+  previewLength?: number,
+  onChange?: (value: string, previewText: string) => void,
+) {
+  const childrenNodes = $getRoot().getAllTextNodes().slice(0, 2)
+  let previewText = ''
+  childrenNodes.forEach((node, index) => {
+    previewText += node.getTextContent()
+    if (index !== childrenNodes.length - 1) {
+      previewText += '\n'
+    }
+  })
+
+  if (previewLength) {
+    previewText = truncateString(previewText, previewLength)
+  }
+
+  try {
+    const stringifiedEditorState = JSON.stringify(editorState.toJSON())
+    onChange?.(stringifiedEditorState, previewText)
+  } catch (error) {
+    window.alert(
+      `An invalid change was made inside the Super editor. Your change was not saved. Please report this error to the team: ${error}`,
+    )
+  }
+}

packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/CollapsibleTitleNode.ts

@@ -11,9 +11,11 @@ import {
   $isElementNode,
   DOMConversionMap,
   EditorConfig,
+  ElementFormatType,
   ElementNode,
   LexicalEditor,
   LexicalNode,
+  NodeKey,
   RangeSelection,
   SerializedElementNode,
   Spread,
@@ -35,13 +37,22 @@ export class CollapsibleTitleNode extends ElementNode {
     return 'collapsible-title'
   }
 
+  constructor({ formatType, key }: { formatType?: ElementFormatType; key?: NodeKey }) {
+    super(key)
+    if (formatType) {
+      super.setFormat(formatType)
+    }
+  }
+
   static override clone(node: CollapsibleTitleNode): CollapsibleTitleNode {
-    return new CollapsibleTitleNode(node.__key)
+    return new CollapsibleTitleNode({ key: node.__key })
   }
 
   override createDOM(_config: EditorConfig, editor: LexicalEditor): HTMLElement {
     const dom = document.createElement('summary')
     dom.classList.add('Collapsible__title')
+    const format = this.getFormatType()
+    dom.style.textAlign = format
     dom.onclick = (event) => {
       event.preventDefault()
       event.stopPropagation()
@@ -63,8 +74,8 @@ export class CollapsibleTitleNode extends ElementNode {
     return {}
   }
 
-  static override importJSON(_serializedNode: SerializedCollapsibleTitleNode): CollapsibleTitleNode {
-    return $createCollapsibleTitleNode()
+  static override importJSON(serializedNode: SerializedCollapsibleTitleNode): CollapsibleTitleNode {
+    return $createCollapsibleTitleNode(serializedNode.format)
   }
 
   override exportJSON(): SerializedCollapsibleTitleNode {
@@ -109,8 +120,10 @@ export class CollapsibleTitleNode extends ElementNode {
   }
 }
 
-export function $createCollapsibleTitleNode(): CollapsibleTitleNode {
-  return new CollapsibleTitleNode()
+export function $createCollapsibleTitleNode(formatType?: ElementFormatType): CollapsibleTitleNode {
+  return new CollapsibleTitleNode({
+    formatType,
+  })
 }
 
 export function $isCollapsibleTitleNode(node: LexicalNode | null | undefined): node is CollapsibleTitleNode {

packages/blocks-editor/src/Lexical/Plugins/FloatingLinkEditorPlugin/index.tsx

@@ -209,8 +209,7 @@ function useFloatingLinkEditorToolbar(editor: LexicalEditor, anchorElem: HTMLEle
       const linkParent = $findMatchingParent(node, $isLinkNode)
       const autoLinkParent = $findMatchingParent(node, $isAutoLinkNode)
 
-      // We don't want this menu to open for auto links.
-      if (linkParent != null && autoLinkParent == null) {
+      if (linkParent != null || autoLinkParent != null) {
         setIsLink(true)
       } else {
         setIsLink(false)

packages/blocks-editor/src/Lexical/Plugins/FloatingTextFormatToolbarPlugin/index.tsx

@@ -337,6 +337,12 @@ function useFloatingTextFormatToolbar(editor: LexicalEditor, anchorElem: HTMLEle
       const nativeSelection = window.getSelection()
       const rootElement = editor.getRootElement()
 
+      const isMobile = window.matchMedia('(max-width: 768px)').matches
+
+      if (isMobile) {
+        return
+      }
+
       if (
         nativeSelection !== null &&
         (!$isRangeSelection(selection) || rootElement === null || !rootElement.contains(nativeSelection.anchorNode))

packages/blocks-editor/src/Lexical/Theme/editor.scss

@@ -272,41 +272,41 @@
   padding: 0;
   margin: 0;
   margin-left: 16px;
-  list-style-position: inside;
+  list-style-position: outside;
 }
 .Lexical__ol2 {
   padding: 0;
   margin: 0;
   margin-left: 16px;
   list-style-type: upper-alpha;
-  list-style-position: inside;
+  list-style-position: outside;
 }
 .Lexical__ol3 {
   padding: 0;
   margin: 0;
   margin-left: 16px;
   list-style-type: lower-alpha;
-  list-style-position: inside;
+  list-style-position: outside;
 }
 .Lexical__ol4 {
   padding: 0;
   margin: 0;
   margin-left: 16px;
   list-style-type: upper-roman;
-  list-style-position: inside;
+  list-style-position: outside;
 }
 .Lexical__ol5 {
   padding: 0;
   margin: 0;
   margin-left: 16px;
   list-style-type: lower-roman;
-  list-style-position: inside;
+  list-style-position: outside;
 }
 .Lexical__ul {
   padding: 0;
   margin: 0;
   margin-left: 16px;
-  list-style-position: inside;
+  list-style-position: outside;
 }
 .Lexical__listItem {
   margin: 0 0px;

packages/desktop/CHANGELOG.md

@@ -3,6 +3,184 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.104.139](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-10)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.138](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.137](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.136](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-09)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.135](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-08)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.134](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.133](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.132](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.131](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.130](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.129](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.128](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.127](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-03)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.126](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-02)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.125](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-02)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.124](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.123](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.122](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.121](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.120](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.119](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.118](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-31)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.117](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-30)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.116](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-28)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.115](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-28)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.114](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.113](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.112](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.111](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.110](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-26)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.109](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-25)
+
+### Bug Fixes
+
+* Fixed issue where popover/modal headers would get cut off by desktop titlebar ([a8c0be4](https://github.com/standardnotes/app/commit/a8c0be4f6327a48ae5e30c45ab4b8acc0c8ad612))
+
+## [3.104.108](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.107](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.106](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.105](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.104](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.103](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.102](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.101](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-21)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.100](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.99](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.98](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.97](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.96](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.104.95](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-19)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/app/javascripts/Main/Window.ts

@@ -121,11 +121,11 @@ export async function createWindowState({
   window.webContents.session.setSpellCheckerDictionaryDownloadURL('https://dictionaries.standardnotes.org/9.4.4/')
 
   /** handle link clicks */
-  window.webContents.on('new-window', (event, url) => {
+  window.webContents.setWindowOpenHandler(({ url }) => {
     if (shouldOpenUrl(url)) {
       void shell.openExternal(url)
     }
-    event.preventDefault()
+    return { action: 'deny' }
   })
 
   /**