diff --git a/.yarn/cache/eslint-plugin-react-npm-7.32.0-60a40d5ae1-b81ce2623b.zip b/.yarn/cache/eslint-plugin-react-npm-7.32.0-60a40d5ae1-b81ce2623b.zip deleted file mode 100644 index 729ade426..000000000 Binary files a/.yarn/cache/eslint-plugin-react-npm-7.32.0-60a40d5ae1-b81ce2623b.zip and /dev/null differ diff --git a/packages/blocks-editor/.eslintignore b/packages/blocks-editor/.eslintignore deleted file mode 100644 index 904b3531d..000000000 --- a/packages/blocks-editor/.eslintignore +++ /dev/null @@ -1,12 +0,0 @@ -# NOTE: In general this should be kept in sync with .eslintignore - -**/dist/** -**/config/** -**/build/** -**/npm/** -**/*.js.flow -**/*.d.ts -**/playwright*/** -**/vite.config.js -**/vite.prod.config.js -**/node_modules diff --git a/packages/blocks-editor/.eslintrc.js b/packages/blocks-editor/.eslintrc.js deleted file mode 100644 index ab45dd8b6..000000000 --- a/packages/blocks-editor/.eslintrc.js +++ /dev/null @@ -1,18 +0,0 @@ -module.exports = { - root: true, - extends: ['../../common.eslintrc.js', 'plugin:react-hooks/recommended'], - parserOptions: { - project: './tsconfig.json', - tsconfigRootDir: __dirname, - }, - ignorePatterns: ['**/*.spec.ts', '__mocks__'], - plugins: ['@typescript-eslint', 'react', 'react-hooks', 'prettier'], - env: { - browser: true, - }, - globals: { - __WEB_VERSION__: true, - JSX: true, - __DEV__: true, - }, -}; diff --git a/packages/blocks-editor/.gitignore b/packages/blocks-editor/.gitignore deleted file mode 100644 index 53c37a166..000000000 --- a/packages/blocks-editor/.gitignore +++ /dev/null @@ -1 +0,0 @@ -dist \ No newline at end of file diff --git a/packages/blocks-editor/.prettierignore b/packages/blocks-editor/.prettierignore deleted file mode 100644 index dac34b8b6..000000000 --- a/packages/blocks-editor/.prettierignore +++ /dev/null @@ -1,15 +0,0 @@ -# NOTE: In general this should be kept in sync with .eslintignore - -packages/**/dist/*.js -packages/**/build/*.js -packages/**/npm/**/* -packages/**/config/*.js -packages/playwright -packages/playwright-core -packages/**/vite.config.js -packages/**/vite.prod.config.js -**/*.md -**/node_modules -flow-typed -.github/CODEOWNERS -.prettierignore diff --git a/packages/blocks-editor/.prettierrc.js b/packages/blocks-editor/.prettierrc.js deleted file mode 100644 index 19e7bc5b0..000000000 --- a/packages/blocks-editor/.prettierrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - singleQuote: true, - trailingComma: 'all', - printWidth: 120, - semi: false, - plugins: [require('prettier-plugin-tailwindcss')], -}; diff --git a/packages/blocks-editor/CHANGELOG.md b/packages/blocks-editor/CHANGELOG.md deleted file mode 100644 index 438102ba0..000000000 --- a/packages/blocks-editor/CHANGELOG.md +++ /dev/null @@ -1,374 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -## [1.17.2](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.17.1...@standardnotes/blocks-editor@1.17.2) (2023-02-16) - -### Bug Fixes - -* Fixes issue where pasting in a new Super note would not save it ([91a8023](https://github.com/standardnotes/app/commit/91a8023fa480adbf9c1e99f2af922facf1fb8d9e)) - -## [1.17.1](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.17.0...@standardnotes/blocks-editor@1.17.1) (2023-02-13) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -# [1.17.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.16.11...@standardnotes/blocks-editor@1.17.0) (2023-02-10) - -### Features - -* Added markdown horizontal rule syntax to Super notes ([033e73b](https://github.com/standardnotes/app/commit/033e73b18938620a4865aabe9650afd2d663ed75)) - -## [1.16.11](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.16.10...@standardnotes/blocks-editor@1.16.11) (2023-02-10) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.16.10](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.16.9...@standardnotes/blocks-editor@1.16.10) (2023-02-09) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.16.9](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.16.8...@standardnotes/blocks-editor@1.16.9) (2023-02-09) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.16.8](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.16.7...@standardnotes/blocks-editor@1.16.8) (2023-02-09) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.16.7](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.16.6...@standardnotes/blocks-editor@1.16.7) (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/blocks-editor@1.16.5...@standardnotes/blocks-editor@1.16.6) (2023-02-03) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.16.5](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.16.4...@standardnotes/blocks-editor@1.16.5) (2023-02-02) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.16.4](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.16.3...@standardnotes/blocks-editor@1.16.4) (2023-02-01) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.16.3](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.16.2...@standardnotes/blocks-editor@1.16.3) (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/blocks-editor@1.16.1...@standardnotes/blocks-editor@1.16.2) (2023-02-01) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.16.1](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.16.0...@standardnotes/blocks-editor@1.16.1) (2023-02-01) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -# [1.16.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.15.0...@standardnotes/blocks-editor@1.16.0) (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/blocks-editor@1.14.1...@standardnotes/blocks-editor@1.15.0) (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/blocks-editor@1.14.0...@standardnotes/blocks-editor@1.14.1) (2023-01-25) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -# [1.14.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.13.0...@standardnotes/blocks-editor@1.14.0) (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/blocks-editor@1.12.4...@standardnotes/blocks-editor@1.13.0) (2023-01-12) - -### Features - -* Added search and replace to Super notes on web/desktop. Press Ctrl+F in a super note to toggle search. (skip e2e) ([#2128](https://github.com/standardnotes/app/issues/2128)) ([8104522](https://github.com/standardnotes/app/commit/8104522658b45c3a5e4d220318a1a3ca60ca4267)) - -## [1.12.4](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.12.3...@standardnotes/blocks-editor@1.12.4) (2023-01-11) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.12.3](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.12.2...@standardnotes/blocks-editor@1.12.3) (2023-01-11) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.12.2](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.12.1...@standardnotes/blocks-editor@1.12.2) (2022-12-29) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.12.1](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.12.0...@standardnotes/blocks-editor@1.12.1) (2022-12-26) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -# [1.12.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.11.3...@standardnotes/blocks-editor@1.12.0) (2022-12-26) - -### Features - -* Clicking the link option in Super notes will automatically add the selected text as the link ([326e1a4](https://github.com/standardnotes/app/commit/326e1a455bb510d795f357123f617618267848cc)) - -## [1.11.3](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.11.2...@standardnotes/blocks-editor@1.11.3) (2022-12-24) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.11.2](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.11.1...@standardnotes/blocks-editor@1.11.2) (2022-12-24) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.11.1](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.11.0...@standardnotes/blocks-editor@1.11.1) (2022-12-24) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -# [1.11.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.10.2...@standardnotes/blocks-editor@1.11.0) (2022-12-24) - -### Features - -* Persist collapsible block state in Super notes ([#2119](https://github.com/standardnotes/app/issues/2119)) ([577318e](https://github.com/standardnotes/app/commit/577318e208367dc52caf2d76fd87419eaead7ed4)) - -## [1.10.2](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.10.1...@standardnotes/blocks-editor@1.10.2) (2022-12-23) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.10.1](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.10.0...@standardnotes/blocks-editor@1.10.1) (2022-12-19) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -# [1.10.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.9.7...@standardnotes/blocks-editor@1.10.0) (2022-12-07) - -### Features - -* add ability to convert selection in Super to bulleted or numbered list ([be4cc4e](https://github.com/standardnotes/app/commit/be4cc4e605100e0a86de214e548e9ed10e2568aa)) - -## [1.9.7](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.9.6...@standardnotes/blocks-editor@1.9.7) (2022-12-07) - -### Bug Fixes - -* improve variance between Super header font sizes and weights ([8b10330](https://github.com/standardnotes/app/commit/8b103307cba41855713b8627cf5d66a6fef6ff52)) - -## [1.9.6](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.9.5...@standardnotes/blocks-editor@1.9.6) (2022-11-30) - -### Bug Fixes - -* Disable all-caps for H2/H3 headings in Super notes ([9b3f11d](https://github.com/standardnotes/app/commit/9b3f11d85b10914a03aab93803513766670c47fe)) -* Super note block drag-n-drop on mobile ([#2072](https://github.com/standardnotes/app/issues/2072)) ([349fd72](https://github.com/standardnotes/app/commit/349fd7204e209d56b720a3b0cc6b2bfc0fc50f47)) - -## [1.9.5](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.9.4...@standardnotes/blocks-editor@1.9.5) (2022-11-30) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.9.4](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.9.3...@standardnotes/blocks-editor@1.9.4) (2022-11-30) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.9.3](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.9.2...@standardnotes/blocks-editor@1.9.3) (2022-11-29) - -### Bug Fixes - -* Make super note styling consistent with plaintext notes ([#2068](https://github.com/standardnotes/app/issues/2068)) ([a417e5b](https://github.com/standardnotes/app/commit/a417e5ba8d3fc224b1527d0a9cfb0f25d197f9de)) - -## [1.9.2](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.9.1...@standardnotes/blocks-editor@1.9.2) (2022-11-28) - -### Bug Fixes - -* Only autofocus super notes when creating new note ([#2063](https://github.com/standardnotes/app/issues/2063)) ([96e8dfd](https://github.com/standardnotes/app/commit/96e8dfdd310fad88a360c4ac984b376b51a618d1)) - -## [1.9.1](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.9.0...@standardnotes/blocks-editor@1.9.1) (2022-11-28) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -# [1.9.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.8.0...@standardnotes/blocks-editor@1.9.0) (2022-11-23) - -### Features - -* dim checked list items in super editor ([#2046](https://github.com/standardnotes/app/issues/2046)) ([8a70915](https://github.com/standardnotes/app/commit/8a709158d6839b9eb1092923a14b0dcadb0da25b)) -* option to show markdown preview for super notes (skip e2e) ([#2048](https://github.com/standardnotes/app/issues/2048)) ([8579ff3](https://github.com/standardnotes/app/commit/8579ff39b1f81dbbcf22b4031ede183ab4287262)) - -# [1.8.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.7.0...@standardnotes/blocks-editor@1.8.0) (2022-11-23) - -### Features - -* use line height preference in super editor (skip e2e) ([#2045](https://github.com/standardnotes/app/issues/2045)) ([87cd31a](https://github.com/standardnotes/app/commit/87cd31ae5d630a528ce6d4895b2c144bf51808f0)) - -# [1.7.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.6.2...@standardnotes/blocks-editor@1.7.0) (2022-11-19) - -### Features - -* ability to drag super list items; secure password generation blocks ([#2039](https://github.com/standardnotes/app/issues/2039)) ([c39c72d](https://github.com/standardnotes/app/commit/c39c72da7a4fb85f4da9aa4e6f8e9f7ba4486a94)) - -## [1.6.2](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.6.1...@standardnotes/blocks-editor@1.6.2) (2022-11-19) - -### Bug Fixes - -* improved error reporting in super; improved draggable block icon padding ([24ff87c](https://github.com/standardnotes/app/commit/24ff87c30625432393ffedeada14478ebb625292)) - -## [1.6.1](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.6.0...@standardnotes/blocks-editor@1.6.1) (2022-11-18) - -### Bug Fixes - -* issue where converting empty plain note to super would result in error ([e58c563](https://github.com/standardnotes/app/commit/e58c5637951f928efcd8c8427f06d0b6c69b5e55)) - -# [1.6.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.5.3...@standardnotes/blocks-editor@1.6.0) (2022-11-18) - -### Features - -* **web:** enable block drag'n'drop in super editor ([#2029](https://github.com/standardnotes/app/issues/2029)) ([dab4f67](https://github.com/standardnotes/app/commit/dab4f678f04aee2c7dfbe7f416e7fc34e8d870cf)) - -## [1.5.3](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.5.2...@standardnotes/blocks-editor@1.5.3) (2022-11-17) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.5.2](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.5.1...@standardnotes/blocks-editor@1.5.2) (2022-11-16) - -### Bug Fixes - -* super editor package ([2a12eb6](https://github.com/standardnotes/app/commit/2a12eb60bb0cc10358c51b3608f6f432667e58b0)) - -## [1.5.1](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.5.0...@standardnotes/blocks-editor@1.5.1) (2022-11-16) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -# [1.5.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.4.1...@standardnotes/blocks-editor@1.5.0) (2022-11-16) - -### Features - -* **labs:** super editor ([#2001](https://github.com/standardnotes/app/issues/2001)) ([59f8547](https://github.com/standardnotes/app/commit/59f8547a8de1c804cb2f01ac734c83268977fa28)) - -## [1.4.1](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.4.0...@standardnotes/blocks-editor@1.4.1) (2022-11-11) - -### Bug Fixes - -* super improvements ([#1995](https://github.com/standardnotes/app/issues/1995)) ([da6f36f](https://github.com/standardnotes/app/commit/da6f36f34cdee324339d2c923d61191b373513f3)) - -# [1.4.0](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.3.11...@standardnotes/blocks-editor@1.4.0) (2022-11-11) - -### Features - -* **dev:** insert current date and time command in super note ([#1994](https://github.com/standardnotes/app/issues/1994)) ([e27ac31](https://github.com/standardnotes/app/commit/e27ac3126ee4fec9e81df8722b6326ba6f38fe5e)) - -## [1.3.11](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.3.10...@standardnotes/blocks-editor@1.3.11) (2022-11-10) - -### Bug Fixes - -* super note improvements ([#1991](https://github.com/standardnotes/app/issues/1991)) ([2dbc895](https://github.com/standardnotes/app/commit/2dbc89594ea2759c49bc318d5efd2b3a5ef3b22d)) - -## [1.3.10](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.3.9...@standardnotes/blocks-editor@1.3.10) (2022-11-09) - -### Bug Fixes - -* link color ([ac4882b](https://github.com/standardnotes/app/commit/ac4882b357162f8737ac32ea9f55884276cc3011)) - -### Reverts - -* Revert "refactor: include themes in components folder" ([3690104](https://github.com/standardnotes/app/commit/3690104934b444ca99eed86c1a41b22a3582811a)) - -## [1.3.9](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.3.8...@standardnotes/blocks-editor@1.3.9) (2022-11-09) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.3.8](https://github.com/standardnotes/app/compare/@standardnotes/blocks-editor@1.3.7...@standardnotes/blocks-editor@1.3.8) (2022-11-08) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## 1.3.7 (2022-11-07) - -**Note:** Version bump only for package @standardnotes/blocks-editor - -## [1.3.6](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.3.5...@standardnotes/toast@1.3.6) (2022-11-04) - -**Note:** Version bump only for package @standardnotes/toast - -## [1.3.5](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.3.4...@standardnotes/toast@1.3.5) (2022-08-11) - -### Bug Fixes - -* optimize toasts for mobile ([#1392](https://github.com/standardnotes/app/issues/1392)) ([40d9392](https://github.com/standardnotes/app/commit/40d9392599e871225abcabcddd51de6cc99a0fe9)) - -## [1.3.4](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.3.3...@standardnotes/toast@1.3.4) (2022-07-14) - -**Note:** Version bump only for package @standardnotes/toast - -## [1.3.3](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.3.2...@standardnotes/toast@1.3.3) (2022-07-13) - -**Note:** Version bump only for package @standardnotes/toast - -## [1.3.2](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.3.1...@standardnotes/toast@1.3.2) (2022-07-06) - -**Note:** Version bump only for package @standardnotes/toast - -## [1.3.1](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.3.0...@standardnotes/toast@1.3.1) (2022-06-28) - -**Note:** Version bump only for package @standardnotes/toast - -# [1.3.0](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.2.4...@standardnotes/toast@1.3.0) (2022-06-27) - -### Features - -* **web:** tailwind css ([#1147](https://github.com/standardnotes/app/issues/1147)) ([b80038f](https://github.com/standardnotes/app/commit/b80038f607d7411912fa99366abf559a44874ef3)) - -## [1.2.4](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.2.4-alpha.0...@standardnotes/toast@1.2.4) (2022-06-18) - -**Note:** Version bump only for package @standardnotes/toast - -## [1.2.4-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.2.3...@standardnotes/toast@1.2.4-alpha.0) (2022-06-18) - -**Note:** Version bump only for package @standardnotes/toast - -## 1.2.3 (2022-06-16) - -**Note:** Version bump only for package @standardnotes/toast - -## 1.2.2 (2022-06-16) - -**Note:** Version bump only for package @standardnotes/toast - -## [1.2.1](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.2.1-alpha.4...@standardnotes/toast@1.2.1) (2022-06-16) - -**Note:** Version bump only for package @standardnotes/toast - -## 1.2.1-alpha.4 (2022-06-16) - -**Note:** Version bump only for package @standardnotes/toast - -## 1.2.1-alpha.3 (2022-06-16) - -**Note:** Version bump only for package @standardnotes/toast - -## 1.2.1-alpha.2 (2022-06-15) - -**Note:** Version bump only for package @standardnotes/toast - -## [1.2.1-alpha.1](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.2.1-alpha.0...@standardnotes/toast@1.2.1-alpha.1) (2022-06-14) - -**Note:** Version bump only for package @standardnotes/toast - -## [1.2.1-alpha.0](https://github.com/standardnotes/app/compare/@standardnotes/toast@1.2.0...@standardnotes/toast@1.2.1-alpha.0) (2022-06-14) - -**Note:** Version bump only for package @standardnotes/toast - -# 1.2.0 (2022-06-10) - -### Features - -* mobile app package ([#1075](https://github.com/standardnotes/app/issues/1075)) ([8248a38](https://github.com/standardnotes/app/commit/8248a38280cb7c92da2b2e9c7db298f34ae8ffdf)) -* styles package ([#1074](https://github.com/standardnotes/app/issues/1074)) ([3100327](https://github.com/standardnotes/app/commit/31003276b73d3e89824bc002fe616fa055e918c4)) -* toast package ([#1073](https://github.com/standardnotes/app/issues/1073)) ([6d0b6e9](https://github.com/standardnotes/app/commit/6d0b6e9018b2a612b8df4827336883fe04033128)) -* **wip:** components monorepo ([#1082](https://github.com/standardnotes/app/issues/1082)) ([e3d6001](https://github.com/standardnotes/app/commit/e3d6001a178e11e619ca724b2b155b7c0405c023)) - -# 1.1.0 (2022-06-10) - -### Features - -* mobile app package ([#1075](https://github.com/standardnotes/app/issues/1075)) ([8248a38](https://github.com/standardnotes/app/commit/8248a38280cb7c92da2b2e9c7db298f34ae8ffdf)) -* styles package ([#1074](https://github.com/standardnotes/app/issues/1074)) ([3100327](https://github.com/standardnotes/app/commit/31003276b73d3e89824bc002fe616fa055e918c4)) -* toast package ([#1073](https://github.com/standardnotes/app/issues/1073)) ([6d0b6e9](https://github.com/standardnotes/app/commit/6d0b6e9018b2a612b8df4827336883fe04033128)) -* **wip:** components monorepo ([8c5e11c](https://github.com/standardnotes/app/commit/8c5e11c22b717ada7a6a9b3115fc4c9b757ec71c)) diff --git a/packages/blocks-editor/README.md b/packages/blocks-editor/README.md deleted file mode 100644 index 4015c1ce7..000000000 --- a/packages/blocks-editor/README.md +++ /dev/null @@ -1 +0,0 @@ -Based on https://github.com/facebook/lexical/tree/main/packages/lexical-playground \ No newline at end of file diff --git a/packages/blocks-editor/blocks.webpack.config.js b/packages/blocks-editor/blocks.webpack.config.js deleted file mode 100644 index f96895882..000000000 --- a/packages/blocks-editor/blocks.webpack.config.js +++ /dev/null @@ -1,32 +0,0 @@ -const path = require('path') -module.exports = () => { - return { - entry: './src/index.ts', - output: { - filename: './dist.js', - }, - mode: 'production', - resolve: { - extensions: ['.ts', '.tsx', '.js'], - }, - externals: { - "@standardnotes/icons": path.resolve(__dirname, "./node_modules/@standardnotes/icons") - }, - module: { - rules: [ - { - test: /\.(js|tsx?)$/, - use: [ - 'babel-loader', - { - loader: 'ts-loader', - options: { - transpileOnly: true, - }, - }, - ], - }, - ], - }, - } -} diff --git a/packages/blocks-editor/package.json b/packages/blocks-editor/package.json deleted file mode 100644 index 71bb7db7f..000000000 --- a/packages/blocks-editor/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "@standardnotes/blocks-editor", - "version": "1.17.2", - "private": true, - "main": "./src/index.ts", - "scripts": { - "tsc": "tsc -p tsconfig.json", - "format": "prettier --write src/", - "lint:fix": "eslint src/ --fix" - }, - "dependencies": { - "@lexical/react": "0.8.0", - "@standardnotes/icons": "workspace:*", - "@types/react": "^18.0.26", - "@types/react-dom": "^18.0.9", - "lexical": "0.8.0", - "react": "^18.2.0", - "react-dom": "^18.2.0" - }, - "devDependencies": { - "eslint": "*", - "eslint-plugin-react": "*", - "eslint-plugin-react-hooks": "*", - "prettier": "*", - "prettier-plugin-tailwindcss": "*", - "typescript": "*" - } -} diff --git a/packages/blocks-editor/src/index.ts b/packages/blocks-editor/src/index.ts deleted file mode 100644 index d525e9bd9..000000000 --- a/packages/blocks-editor/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './Editor/BlocksEditor' -export * from './Editor/BlocksEditorComposer' -export * from './Editor/Constants' -export * from './Editor/MarkdownTransformers' diff --git a/packages/blocks-editor/tailwind.config.js b/packages/blocks-editor/tailwind.config.js deleted file mode 100644 index 5bd6316f0..000000000 --- a/packages/blocks-editor/tailwind.config.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - presets: [require('../web/tailwind.config.js')], - // ... -} diff --git a/packages/blocks-editor/tsconfig.json b/packages/blocks-editor/tsconfig.json deleted file mode 100644 index a46fc991c..000000000 --- a/packages/blocks-editor/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../UILib.tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "rootDir": "src", - "outDir": "dist" - }, - "include": ["src", "../web/src/javascripts/Components/BlockEditor/EncryptedFileNode.tsx"], - "exclude": ["dist", "node_modules"] -} diff --git a/packages/web/package.json b/packages/web/package.json index 9be96cc86..398750faa 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -40,7 +40,6 @@ "@reach/visually-hidden": "^0.18.0", "@standardnotes/authenticator": "^2.3.9", "@standardnotes/autobiography-theme": "^1.2.7", - "@standardnotes/blocks-editor": "workspace:*", "@standardnotes/bold-editor": "^1.6.4", "@standardnotes/classic-code-editor": "^1.5.7", "@standardnotes/dynamic-theme": "^1.2.8", diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx index 1e63741fe..9bc6e65ba 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx +++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx @@ -10,7 +10,7 @@ import { EditorMenuItem } from '@/Components/NotesOptions/EditorMenuItem' import { createEditorMenuGroups } from '../../Utils/createEditorMenuGroups' import { reloadFont } from '../NoteView/FontFunctions' import { PremiumFeatureIconClass, PremiumFeatureIconName } from '../Icon/PremiumFeatureIcon' -import { SuperNoteImporter } from '../NoteView/SuperEditor/SuperNoteImporter' +import { SuperNoteImporter } from '../SuperEditor/SuperNoteImporter' import MenuRadioButtonItem from '../Menu/MenuRadioButtonItem' import { Pill } from '../Preferences/PreferencesComponents/Content' import ModalOverlay from '../Modal/ModalOverlay' diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleMenu.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleMenu.tsx index 8cd238ebf..8607e88ef 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleMenu.tsx +++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleMenu.tsx @@ -10,7 +10,7 @@ import Menu from '../Menu/Menu' import MenuItem from '../Menu/MenuItem' import { EditorMenuGroup } from '../NotesOptions/EditorMenuGroup' import { EditorMenuItem } from '../NotesOptions/EditorMenuItem' -import { SuperNoteImporter } from '../NoteView/SuperEditor/SuperNoteImporter' +import { SuperNoteImporter } from '../SuperEditor/SuperNoteImporter' import { Pill } from '../Preferences/PreferencesComponents/Content' import ModalOverlay from '../Modal/ModalOverlay' diff --git a/packages/web/src/javascripts/Components/NoteView/NoteView.tsx b/packages/web/src/javascripts/Components/NoteView/NoteView.tsx index b5d594efa..8d86dceb3 100644 --- a/packages/web/src/javascripts/Components/NoteView/NoteView.tsx +++ b/packages/web/src/javascripts/Components/NoteView/NoteView.tsx @@ -27,7 +27,7 @@ import { } from '@standardnotes/snjs' import { confirmDialog, DELETE_NOTE_KEYBOARD_COMMAND, KeyboardKey } from '@standardnotes/ui-services' import { ChangeEventHandler, createRef, KeyboardEventHandler, RefObject } from 'react' -import { SuperEditor } from './SuperEditor/SuperEditor' +import { SuperEditor } from '../SuperEditor/SuperEditor' import IndicatorCircle from '../IndicatorCircle/IndicatorCircle' import LinkedItemBubblesContainer from '../LinkedItems/LinkedItemBubblesContainer' import LinkedItemsButton from '../LinkedItems/LinkedItemsButton' @@ -41,7 +41,7 @@ import { transactionForAssociateComponentWithCurrentNote, transactionForDisassociateComponentWithCurrentNote, } from './TransactionFunctions' -import { SuperEditorContentId } from '@standardnotes/blocks-editor' +import { SuperEditorContentId } from '../SuperEditor/Constants' import { NoteViewController } from './Controller/NoteViewController' import { PlainEditor, PlainEditorInterface } from './PlainEditor/PlainEditor' diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperEditorNodes.ts b/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperEditorNodes.ts deleted file mode 100644 index 03941724e..000000000 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperEditorNodes.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { FileNode } from './Plugins/EncryptedFilePlugin/Nodes/FileNode' -import { BubbleNode } from './Plugins/ItemBubblePlugin/Nodes/BubbleNode' - -export const SuperEditorNodes = [FileNode, BubbleNode] diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx index 023d5d185..ded55e22b 100644 --- a/packages/web/src/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx +++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx @@ -6,9 +6,8 @@ import ComponentView from '@/Components/ComponentView/ComponentView' import { NotesController } from '@/Controllers/NotesController/NotesController' import { NoteHistoryController } from '@/Controllers/NoteHistory/NoteHistoryController' import { ErrorBoundary } from '@/Utils/ErrorBoundary' -import { BlocksEditorComposer, BlocksEditor } from '@standardnotes/blocks-editor' -import { FileNode } from '../NoteView/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileNode' -import { BubbleNode } from '../NoteView/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleNode' +import { BlocksEditor } from '../SuperEditor/BlocksEditor' +import { BlocksEditorComposer } from '../SuperEditor/BlocksEditorComposer' const ABSOLUTE_CENTER_CLASSNAME = 'absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2' @@ -64,15 +63,11 @@ const SelectedRevisionContent: FunctionComponent = ) : note?.noteType === NoteType.Super ? ( -
- +
+ diff --git a/packages/blocks-editor/src/Editor/BlocksEditor.tsx b/packages/web/src/javascripts/Components/SuperEditor/BlocksEditor.tsx similarity index 82% rename from packages/blocks-editor/src/Editor/BlocksEditor.tsx rename to packages/web/src/javascripts/Components/SuperEditor/BlocksEditor.tsx index 783de5f47..f284a2778 100644 --- a/packages/blocks-editor/src/Editor/BlocksEditor.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/BlocksEditor.tsx @@ -12,16 +12,16 @@ import { HistoryPlugin } from '@lexical/react/LexicalHistoryPlugin' import { LinkPlugin } from '@lexical/react/LexicalLinkPlugin' import { ListPlugin } from '@lexical/react/LexicalListPlugin' import { EditorState, LexicalEditor } from 'lexical' -import HorizontalRulePlugin from '../Lexical/Plugins/HorizontalRulePlugin' -import TwitterPlugin from '../Lexical/Plugins/TwitterPlugin' -import YouTubePlugin from '../Lexical/Plugins/YouTubePlugin' -import AutoEmbedPlugin from '../Lexical/Plugins/AutoEmbedPlugin' -import CollapsiblePlugin from '../Lexical/Plugins/CollapsiblePlugin' -import DraggableBlockPlugin from '../Lexical/Plugins/DraggableBlockPlugin' -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 HorizontalRulePlugin from './Plugins/HorizontalRulePlugin' +import TwitterPlugin from './Plugins/TwitterPlugin' +import YouTubePlugin from './Plugins/YouTubePlugin' +import AutoEmbedPlugin from './Plugins/AutoEmbedPlugin' +import CollapsiblePlugin from './Plugins/CollapsiblePlugin' +import DraggableBlockPlugin from './Plugins/DraggableBlockPlugin' +import CodeHighlightPlugin from './Plugins/CodeHighlightPlugin' +import FloatingTextFormatToolbarPlugin from './Plugins/FloatingTextFormatToolbarPlugin' +import FloatingLinkEditorPlugin from './Plugins/FloatingLinkEditorPlugin' +import { TabIndentationPlugin } from './Plugins/TabIndentationPlugin' import { handleEditorChange } from './Utils' import { SuperEditorContentId } from './Constants' import { classNames } from '@standardnotes/utils' @@ -106,7 +106,7 @@ export const BlocksEditor: FunctionComponent = ({ {!readonly && floatingAnchorElem && ( <> - + )} diff --git a/packages/blocks-editor/src/Editor/BlocksEditorComposer.tsx b/packages/web/src/javascripts/Components/SuperEditor/BlocksEditorComposer.tsx similarity index 88% rename from packages/blocks-editor/src/Editor/BlocksEditorComposer.tsx rename to packages/web/src/javascripts/Components/SuperEditor/BlocksEditorComposer.tsx index 22b75426a..ed0cec74a 100644 --- a/packages/blocks-editor/src/Editor/BlocksEditorComposer.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/BlocksEditorComposer.tsx @@ -1,7 +1,7 @@ import { FunctionComponent } from 'react' import { LexicalComposer } from '@lexical/react/LexicalComposer' -import BlocksEditorTheme from '../Lexical/Theme/Theme' -import { BlockEditorNodes } from '../Lexical/Nodes/AllNodes' +import BlocksEditorTheme from './Lexical/Theme/Theme' +import { BlockEditorNodes } from './Lexical/Nodes/AllNodes' import { Klass, LexicalNode } from 'lexical' type BlocksEditorComposerProps = { diff --git a/packages/blocks-editor/src/Editor/Constants.ts b/packages/web/src/javascripts/Components/SuperEditor/Constants.ts similarity index 100% rename from packages/blocks-editor/src/Editor/Constants.ts rename to packages/web/src/javascripts/Components/SuperEditor/Constants.ts diff --git a/packages/blocks-editor/src/Lexical/Hooks/useModal.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Hooks/useModal.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/Hooks/useModal.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Hooks/useModal.tsx diff --git a/packages/blocks-editor/src/Lexical/Icons/chevron-down.svg b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Icons/chevron-down.svg similarity index 100% rename from packages/blocks-editor/src/Lexical/Icons/chevron-down.svg rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Icons/chevron-down.svg diff --git a/packages/blocks-editor/src/Lexical/Icons/draggable-block-menu.svg b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Icons/draggable-block-menu.svg similarity index 100% rename from packages/blocks-editor/src/Lexical/Icons/draggable-block-menu.svg rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Icons/draggable-block-menu.svg diff --git a/packages/blocks-editor/src/Lexical/Icons/pencil-fill.svg b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Icons/pencil-fill.svg similarity index 100% rename from packages/blocks-editor/src/Lexical/Icons/pencil-fill.svg rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Icons/pencil-fill.svg diff --git a/packages/blocks-editor/src/Lexical/Icons/plus.svg b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Icons/plus.svg similarity index 100% rename from packages/blocks-editor/src/Lexical/Icons/plus.svg rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Icons/plus.svg diff --git a/packages/blocks-editor/src/Lexical/Nodes/AllNodes.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/AllNodes.ts similarity index 67% rename from packages/blocks-editor/src/Lexical/Nodes/AllNodes.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/AllNodes.ts index 5db562882..0724e4dfa 100644 --- a/packages/blocks-editor/src/Lexical/Nodes/AllNodes.ts +++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/AllNodes.ts @@ -9,9 +9,11 @@ import { HeadingNode, QuoteNode } from '@lexical/rich-text' import { TableCellNode, TableNode, TableRowNode } from '@lexical/table' import { TweetNode } from './TweetNode' import { YouTubeNode } from './YouTubeNode' -import { CollapsibleContainerNode } from '../Plugins/CollapsiblePlugin/CollapsibleContainerNode' -import { CollapsibleContentNode } from '../Plugins/CollapsiblePlugin/CollapsibleContentNode' -import { CollapsibleTitleNode } from '../Plugins/CollapsiblePlugin/CollapsibleTitleNode' +import { CollapsibleContainerNode } from '../../Plugins/CollapsiblePlugin/CollapsibleContainerNode' +import { CollapsibleContentNode } from '../../Plugins/CollapsiblePlugin/CollapsibleContentNode' +import { CollapsibleTitleNode } from '../../Plugins/CollapsiblePlugin/CollapsibleTitleNode' +import { FileNode } from '../../Plugins/EncryptedFilePlugin/Nodes/FileNode' +import { BubbleNode } from '../../Plugins/ItemBubblePlugin/Nodes/BubbleNode' export const BlockEditorNodes = [ AutoLinkNode, @@ -34,4 +36,6 @@ export const BlockEditorNodes = [ TableRowNode, TweetNode, YouTubeNode, + FileNode, + BubbleNode, ] diff --git a/packages/blocks-editor/src/Lexical/Nodes/TableComponent.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/TableComponent.tsx similarity index 99% rename from packages/blocks-editor/src/Lexical/Nodes/TableComponent.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/TableComponent.tsx index f8c8bf693..1c2901a6c 100644 --- a/packages/blocks-editor/src/Lexical/Nodes/TableComponent.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/TableComponent.tsx @@ -50,8 +50,7 @@ import { import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react' import { createPortal } from 'react-dom' import { IS_APPLE } from '../Shared/environment' - -import { CellContext } from '../Plugins/TablePlugin' +import { CellContext } from '../../Plugins/TablePlugin' import { $isTableNode, Cell, diff --git a/packages/blocks-editor/src/Lexical/Nodes/TableNode.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/TableNode.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/Nodes/TableNode.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/TableNode.tsx diff --git a/packages/blocks-editor/src/Lexical/Nodes/TweetNode.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/TweetNode.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/Nodes/TweetNode.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/TweetNode.tsx diff --git a/packages/blocks-editor/src/Lexical/Nodes/YouTubeNode.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/YouTubeNode.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/Nodes/YouTubeNode.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Nodes/YouTubeNode.tsx diff --git a/packages/blocks-editor/src/Lexical/Shared/canUseDOM.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Shared/canUseDOM.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Shared/canUseDOM.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Shared/canUseDOM.ts diff --git a/packages/blocks-editor/src/Lexical/Shared/environment.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Shared/environment.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Shared/environment.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Shared/environment.ts diff --git a/packages/blocks-editor/src/Lexical/Shared/invariant.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Shared/invariant.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Shared/invariant.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Shared/invariant.ts diff --git a/packages/blocks-editor/src/Lexical/Theme/IconComponent.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/IconComponent.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/Theme/IconComponent.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/IconComponent.tsx diff --git a/packages/blocks-editor/src/Lexical/Theme/Theme.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/Theme.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Theme/Theme.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/Theme.ts diff --git a/packages/blocks-editor/src/Lexical/Theme/base.scss b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/base.scss similarity index 100% rename from packages/blocks-editor/src/Lexical/Theme/base.scss rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/base.scss diff --git a/packages/blocks-editor/src/Lexical/Theme/custom.scss b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/custom.scss similarity index 68% rename from packages/blocks-editor/src/Lexical/Theme/custom.scss rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/custom.scss index 4520cf017..1757cc167 100644 --- a/packages/blocks-editor/src/Lexical/Theme/custom.scss +++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/custom.scss @@ -1,4 +1,4 @@ -@import '../Plugins//DraggableBlockPlugin/index.scss'; +@import '../../Plugins/DraggableBlockPlugin/index.scss'; #typeahead-menu { z-index: 10000; diff --git a/packages/blocks-editor/src/Lexical/Theme/editor.scss b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss similarity index 100% rename from packages/blocks-editor/src/Lexical/Theme/editor.scss rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss diff --git a/packages/blocks-editor/src/Lexical/Theme/icons.scss b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/icons.scss similarity index 100% rename from packages/blocks-editor/src/Lexical/Theme/icons.scss rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/icons.scss diff --git a/packages/blocks-editor/src/Lexical/Theme/lexical.scss b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/lexical.scss similarity index 100% rename from packages/blocks-editor/src/Lexical/Theme/lexical.scss rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/lexical.scss diff --git a/packages/blocks-editor/src/Lexical/Theme/links.scss b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/links.scss similarity index 100% rename from packages/blocks-editor/src/Lexical/Theme/links.scss rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/links.scss diff --git a/packages/blocks-editor/src/Lexical/UI/Button.css b/packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Button.css similarity index 100% rename from packages/blocks-editor/src/Lexical/UI/Button.css rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Button.css diff --git a/packages/blocks-editor/src/Lexical/UI/Button.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Button.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/UI/Button.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Button.tsx diff --git a/packages/blocks-editor/src/Lexical/UI/Dialog.css b/packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Dialog.css similarity index 100% rename from packages/blocks-editor/src/Lexical/UI/Dialog.css rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Dialog.css diff --git a/packages/blocks-editor/src/Lexical/UI/Dialog.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Dialog.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/UI/Dialog.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Dialog.tsx diff --git a/packages/blocks-editor/src/Lexical/UI/Input.css b/packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Input.css similarity index 100% rename from packages/blocks-editor/src/Lexical/UI/Input.css rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Input.css diff --git a/packages/blocks-editor/src/Lexical/UI/LinkPreview.css b/packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/LinkPreview.css similarity index 100% rename from packages/blocks-editor/src/Lexical/UI/LinkPreview.css rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/LinkPreview.css diff --git a/packages/blocks-editor/src/Lexical/UI/LinkPreview.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/LinkPreview.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/UI/LinkPreview.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/LinkPreview.tsx diff --git a/packages/blocks-editor/src/Lexical/UI/Modal.css b/packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Modal.css similarity index 100% rename from packages/blocks-editor/src/Lexical/UI/Modal.css rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Modal.css diff --git a/packages/blocks-editor/src/Lexical/UI/Modal.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Modal.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/UI/Modal.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/Modal.tsx diff --git a/packages/blocks-editor/src/Lexical/UI/TextInput.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/TextInput.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/UI/TextInput.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/UI/TextInput.tsx diff --git a/packages/blocks-editor/src/Lexical/Utils/getDOMRangeRect.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/getDOMRangeRect.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Utils/getDOMRangeRect.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/getDOMRangeRect.ts diff --git a/packages/blocks-editor/src/Lexical/Utils/getSelectedNode.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/getSelectedNode.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Utils/getSelectedNode.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/getSelectedNode.ts diff --git a/packages/blocks-editor/src/Lexical/Utils/guard.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/guard.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Utils/guard.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/guard.ts diff --git a/packages/blocks-editor/src/Lexical/Utils/join-classes.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/join-classes.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Utils/join-classes.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/join-classes.ts diff --git a/packages/blocks-editor/src/Lexical/Utils/point.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/point.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Utils/point.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/point.ts diff --git a/packages/blocks-editor/src/Lexical/Utils/rect.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/rect.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Utils/rect.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/rect.ts diff --git a/packages/blocks-editor/src/Lexical/Utils/sanitizeUrl.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/sanitizeUrl.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Utils/sanitizeUrl.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/sanitizeUrl.ts diff --git a/packages/blocks-editor/src/Lexical/Utils/setFloatingElemPosition.ts b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/setFloatingElemPosition.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Utils/setFloatingElemPosition.ts rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/setFloatingElemPosition.ts diff --git a/packages/blocks-editor/src/Editor/MarkdownTransformers.ts b/packages/web/src/javascripts/Components/SuperEditor/MarkdownTransformers.ts similarity index 100% rename from packages/blocks-editor/src/Editor/MarkdownTransformers.ts rename to packages/web/src/javascripts/Components/SuperEditor/MarkdownTransformers.ts diff --git a/packages/blocks-editor/src/Lexical/Plugins/AutoEmbedPlugin/index.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/AutoEmbedPlugin/index.tsx similarity index 97% rename from packages/blocks-editor/src/Lexical/Plugins/AutoEmbedPlugin/index.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/AutoEmbedPlugin/index.tsx index 02dacc808..c81c0447e 100644 --- a/packages/blocks-editor/src/Lexical/Plugins/AutoEmbedPlugin/index.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/AutoEmbedPlugin/index.tsx @@ -19,9 +19,9 @@ import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext import { useState } from 'react' import * as ReactDOM from 'react-dom' -import useModal from '../../Hooks/useModal' -import Button from '../../UI/Button' -import { DialogActions } from '../../UI/Dialog' +import useModal from '../../Lexical/Hooks/useModal' +import Button from '../../Lexical/UI/Button' +import { DialogActions } from '../../Lexical/UI/Dialog' import { INSERT_TWEET_COMMAND } from '../TwitterPlugin' import { INSERT_YOUTUBE_COMMAND } from '../YouTubePlugin' diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/AutoLinkPlugin/AutoLinkPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/AutoLinkPlugin/AutoLinkPlugin.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/AutoLinkPlugin/AutoLinkPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/AutoLinkPlugin/AutoLinkPlugin.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerMenuItem.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerMenuItem.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerMenuItem.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerMenuItem.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerOption.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerOption.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerOption.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerOption.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerPlugin.tsx similarity index 96% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerPlugin.tsx index af102fcc7..c473f6b01 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerPlugin.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerPlugin.tsx @@ -2,8 +2,8 @@ import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext import { LexicalTypeaheadMenuPlugin, useBasicTypeaheadTriggerMatch } from '@lexical/react/LexicalTypeaheadMenuPlugin' import { TextNode } from 'lexical' import { useCallback, useMemo, useState } from 'react' -import useModal from '@standardnotes/blocks-editor/src/Lexical/Hooks/useModal' -import { InsertTableDialog } from '@standardnotes/blocks-editor/src/Lexical/Plugins/TablePlugin' +import useModal from '../../Lexical/Hooks/useModal' +import { InsertTableDialog } from '../../Plugins/TablePlugin' import { BlockPickerOption } from './BlockPickerOption' import { BlockPickerMenuItem } from './BlockPickerMenuItem' import { GetNumberedListBlockOption } from './Options/NumberedList' diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Alignment.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Alignment.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Alignment.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Alignment.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/BulletedList.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/BulletedList.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/BulletedList.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/BulletedList.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Checklist.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Checklist.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Checklist.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Checklist.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Code.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Code.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Code.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Code.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Collapsible.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Collapsible.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Collapsible.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Collapsible.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/DateTime.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/DateTime.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/DateTime.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/DateTime.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Divider.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Divider.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Divider.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Divider.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Embeds.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Embeds.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Embeds.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Embeds.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Headings.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Headings.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Headings.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Headings.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/IndentOutdent.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/IndentOutdent.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/IndentOutdent.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/IndentOutdent.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/NumberedList.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/NumberedList.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/NumberedList.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/NumberedList.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Paragraph.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Paragraph.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Paragraph.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Paragraph.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Password.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Password.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Password.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Password.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Quote.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Quote.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Quote.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Quote.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Table.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Table.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Options/Table.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/Options/Table.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Alignment.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Alignment.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Alignment.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Alignment.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/BulletedList.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/BulletedList.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/BulletedList.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/BulletedList.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Checklist.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Checklist.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Checklist.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Checklist.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Code.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Code.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Code.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Code.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Collapsible.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Collapsible.tsx similarity index 78% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Collapsible.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Collapsible.tsx index 8a65e3880..54170854d 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Collapsible.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Collapsible.tsx @@ -1,5 +1,5 @@ import { LexicalEditor } from 'lexical' -import { INSERT_COLLAPSIBLE_COMMAND } from '@standardnotes/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin' +import { INSERT_COLLAPSIBLE_COMMAND } from '../../Plugins/CollapsiblePlugin' import { LexicalIconName } from '@/Components/Icon/LexicalIcons' export function GetCollapsibleBlock(editor: LexicalEditor) { diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/DateTime.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/DateTime.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/DateTime.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/DateTime.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Divider.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Divider.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Divider.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Divider.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Embeds.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Embeds.tsx similarity index 84% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Embeds.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Embeds.tsx index fff1d076b..308042ba0 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Embeds.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Embeds.tsx @@ -1,6 +1,6 @@ import { LexicalEditor } from 'lexical' import { INSERT_EMBED_COMMAND } from '@lexical/react/LexicalAutoEmbedPlugin' -import { EmbedConfigs } from '@standardnotes/blocks-editor/src/Lexical/Plugins/AutoEmbedPlugin' +import { EmbedConfigs } from '../AutoEmbedPlugin' import { LexicalIconName } from '@/Components/Icon/LexicalIcons' export function GetEmbedsBlocks(editor: LexicalEditor) { diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Headings.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Headings.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Headings.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Headings.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/IndentOutdent.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/IndentOutdent.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/IndentOutdent.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/IndentOutdent.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/NumberedList.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/NumberedList.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/NumberedList.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/NumberedList.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Paragraph.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Paragraph.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Paragraph.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Paragraph.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Password.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Password.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Password.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Password.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Quote.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Quote.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Quote.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Quote.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Table.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Table.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Blocks/Table.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Table.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ChangeContentCallback/ChangeContentCallback.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ChangeContentCallback/ChangeContentCallback.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ChangeContentCallback/ChangeContentCallback.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ChangeContentCallback/ChangeContentCallback.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ClassNames.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ClassNames.ts similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ClassNames.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ClassNames.ts diff --git a/packages/blocks-editor/src/Lexical/Plugins/CodeHighlightPlugin/index.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/CodeHighlightPlugin/index.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/CodeHighlightPlugin/index.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/CodeHighlightPlugin/index.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/CodeOptionsPlugin/CodeOptions.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/CodeOptionsPlugin/CodeOptions.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/CodeOptionsPlugin/CodeOptions.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/CodeOptionsPlugin/CodeOptions.tsx diff --git a/packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/Collapsible.css b/packages/web/src/javascripts/Components/SuperEditor/Plugins/CollapsiblePlugin/Collapsible.css similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/Collapsible.css rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/CollapsiblePlugin/Collapsible.css diff --git a/packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/CollapsibleContainerNode.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/CollapsiblePlugin/CollapsibleContainerNode.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/CollapsibleContainerNode.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/CollapsiblePlugin/CollapsibleContainerNode.ts diff --git a/packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/CollapsibleContentNode.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/CollapsiblePlugin/CollapsibleContentNode.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/CollapsibleContentNode.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/CollapsiblePlugin/CollapsibleContentNode.ts diff --git a/packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/CollapsibleTitleNode.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/CollapsiblePlugin/CollapsibleTitleNode.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/CollapsibleTitleNode.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/CollapsiblePlugin/CollapsibleTitleNode.ts diff --git a/packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/index.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/CollapsiblePlugin/index.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/index.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/CollapsiblePlugin/index.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Commands.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Commands.ts similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/Commands.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/Commands.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/DateTimePlugin/DateTimePlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/DateTimePlugin/DateTimePlugin.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/DateTimePlugin/DateTimePlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/DateTimePlugin/DateTimePlugin.tsx diff --git a/packages/blocks-editor/src/Lexical/Plugins/DraggableBlockPlugin/index.scss b/packages/web/src/javascripts/Components/SuperEditor/Plugins/DraggableBlockPlugin/index.scss similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/DraggableBlockPlugin/index.scss rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/DraggableBlockPlugin/index.scss diff --git a/packages/blocks-editor/src/Lexical/Plugins/DraggableBlockPlugin/index.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/DraggableBlockPlugin/index.tsx similarity index 98% rename from packages/blocks-editor/src/Lexical/Plugins/DraggableBlockPlugin/index.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/DraggableBlockPlugin/index.tsx index 9db71084b..473d9dfd0 100644 --- a/packages/blocks-editor/src/Lexical/Plugins/DraggableBlockPlugin/index.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/DraggableBlockPlugin/index.tsx @@ -24,9 +24,9 @@ import { DragEvent as ReactDragEvent, TouchEvent, useCallback, useEffect, useRef import { createPortal } from 'react-dom' import { BlockIcon } from '@standardnotes/icons' -import { isHTMLElement } from '../../Utils/guard' -import { Point } from '../../Utils/point' -import { ContainsPointReturn, Rect } from '../../Utils/rect' +import { isHTMLElement } from '../../Lexical/Utils/guard' +import { Point } from '../../Lexical/Utils/point' +import { ContainsPointReturn, Rect } from '../../Lexical/Utils/rect' const DRAGGABLE_BLOCK_MENU_LEFT_SPACE = -2 const TARGET_LINE_HALF_HEIGHT = 2 diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/EncryptedFilePlugin/FilePlugin.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/FilePlugin.ts similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/EncryptedFilePlugin/FilePlugin.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/FilePlugin.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileComponent.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileComponent.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileComponent.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileComponent.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileNode.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileNode.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileNode.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileNode.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileUtils.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileUtils.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileUtils.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/FileUtils.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/SerializedFileNode.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/SerializedFileNode.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/SerializedFileNode.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/EncryptedFilePlugin/Nodes/SerializedFileNode.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ExportPlugin/ExportPlugin.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ExportPlugin/ExportPlugin.ts similarity index 98% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ExportPlugin/ExportPlugin.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ExportPlugin/ExportPlugin.ts index 5dccde5d1..485278955 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ExportPlugin/ExportPlugin.ts +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ExportPlugin/ExportPlugin.ts @@ -11,7 +11,7 @@ import { } from '@standardnotes/ui-services' import { useCallback, useEffect } from 'react' import { $convertToMarkdownString } from '@lexical/markdown' -import { MarkdownTransformers } from '@standardnotes/blocks-editor' +import { MarkdownTransformers } from '../../MarkdownTransformers' import { $generateHtmlFromNodes } from '@lexical/html' import { useCommandService } from '@/Components/CommandProvider' diff --git a/packages/blocks-editor/src/Lexical/Plugins/FloatingLinkEditorPlugin/index.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/FloatingLinkEditorPlugin/index.tsx similarity index 90% rename from packages/blocks-editor/src/Lexical/Plugins/FloatingLinkEditorPlugin/index.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/FloatingLinkEditorPlugin/index.tsx index 882422667..ffbb2db49 100644 --- a/packages/blocks-editor/src/Lexical/Plugins/FloatingLinkEditorPlugin/index.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/FloatingLinkEditorPlugin/index.tsx @@ -22,12 +22,13 @@ import { import { useCallback, useEffect, useRef, useState } from 'react' import { createPortal } from 'react-dom' -import LinkPreview from '../../UI/LinkPreview' -import { getSelectedNode } from '../../Utils/getSelectedNode' -import { sanitizeUrl } from '../../Utils/sanitizeUrl' -import { setFloatingElemPosition } from '../../Utils/setFloatingElemPosition' +import LinkPreview from '../../Lexical/UI/LinkPreview' +import { getSelectedNode } from '../../Lexical/Utils/getSelectedNode' +import { sanitizeUrl } from '../../Lexical/Utils/sanitizeUrl' +import { setFloatingElemPosition } from '../../Lexical/Utils/setFloatingElemPosition' import { LexicalPencilFill } from '@standardnotes/icons' -import { IconComponent } from '../../../Lexical/Theme/IconComponent' +import { IconComponent } from '../../Lexical/../Lexical/Theme/IconComponent' +import { getDOMRangeRect } from '../../Lexical/Utils/getDOMRangeRect' function FloatingLinkEditor({ editor, anchorElem }: { editor: LexicalEditor; anchorElem: HTMLElement }): JSX.Element { const editorRef = useRef(null) @@ -65,17 +66,7 @@ function FloatingLinkEditor({ editor, anchorElem }: { editor: LexicalEditor; anc rootElement !== null && rootElement.contains(nativeSelection.anchorNode) ) { - const domRange = nativeSelection.getRangeAt(0) - let rect - if (nativeSelection.anchorNode === rootElement) { - let inner = rootElement - while (inner.firstElementChild != null) { - inner = inner.firstElementChild as HTMLElement - } - rect = inner.getBoundingClientRect() - } else { - rect = domRange.getBoundingClientRect() - } + const rect = getDOMRangeRect(nativeSelection, rootElement) setFloatingElemPosition(rect, editorElem, anchorElem) setLastSelection(selection) diff --git a/packages/blocks-editor/src/Lexical/Plugins/FloatingTextFormatToolbarPlugin/index.css b/packages/web/src/javascripts/Components/SuperEditor/Plugins/FloatingTextFormatToolbarPlugin/index.css similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/FloatingTextFormatToolbarPlugin/index.css rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/FloatingTextFormatToolbarPlugin/index.css diff --git a/packages/blocks-editor/src/Lexical/Plugins/FloatingTextFormatToolbarPlugin/index.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/FloatingTextFormatToolbarPlugin/index.tsx similarity index 97% rename from packages/blocks-editor/src/Lexical/Plugins/FloatingTextFormatToolbarPlugin/index.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/FloatingTextFormatToolbarPlugin/index.tsx index 68714eca6..19292e6dc 100644 --- a/packages/blocks-editor/src/Lexical/Plugins/FloatingTextFormatToolbarPlugin/index.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/FloatingTextFormatToolbarPlugin/index.tsx @@ -34,9 +34,9 @@ import { import { useCallback, useEffect, useRef, useState } from 'react' import { createPortal } from 'react-dom' -import { getDOMRangeRect } from '../../Utils/getDOMRangeRect' -import { getSelectedNode } from '../../Utils/getSelectedNode' -import { setFloatingElemPosition } from '../../Utils/setFloatingElemPosition' +import { getDOMRangeRect } from '../../Lexical/Utils/getDOMRangeRect' +import { getSelectedNode } from '../../Lexical/Utils/getSelectedNode' +import { setFloatingElemPosition } from '../../Lexical/Utils/setFloatingElemPosition' import { BoldIcon, ItalicIcon, @@ -49,8 +49,8 @@ import { ListBulleted, ListNumbered, } from '@standardnotes/icons' -import { IconComponent } from '../../Theme/IconComponent' -import { sanitizeUrl } from '../../Utils/sanitizeUrl' +import { IconComponent } from '../../Lexical/Theme/IconComponent' +import { sanitizeUrl } from '../../Lexical/Utils/sanitizeUrl' const blockTypeToBlockName = { bullet: 'Bulleted List', diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/GetMarkdownPlugin/GetMarkdownPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/GetMarkdownPlugin/GetMarkdownPlugin.tsx similarity index 91% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/GetMarkdownPlugin/GetMarkdownPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/GetMarkdownPlugin/GetMarkdownPlugin.tsx index afffe5ee7..151fd98a6 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/GetMarkdownPlugin/GetMarkdownPlugin.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/GetMarkdownPlugin/GetMarkdownPlugin.tsx @@ -1,6 +1,6 @@ import { forwardRef, useCallback, useImperativeHandle } from 'react' import { $convertToMarkdownString } from '@lexical/markdown' -import { MarkdownTransformers } from '@standardnotes/blocks-editor' +import { MarkdownTransformers } from '../../MarkdownTransformers' import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' export type GetMarkdownPluginInterface = { diff --git a/packages/blocks-editor/src/Lexical/Plugins/HorizontalRulePlugin/index.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/HorizontalRulePlugin/index.ts similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/HorizontalRulePlugin/index.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/HorizontalRulePlugin/index.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ImportPlugin/ImportPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ImportPlugin/ImportPlugin.tsx similarity index 95% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ImportPlugin/ImportPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ImportPlugin/ImportPlugin.tsx index c3a2b393c..2cda229ef 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ImportPlugin/ImportPlugin.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ImportPlugin/ImportPlugin.tsx @@ -3,7 +3,7 @@ import { useEffect } from 'react' import { $convertFromMarkdownString, TRANSFORMERS } from '@lexical/markdown' import { $generateNodesFromDOM } from '@lexical/html' import { $createParagraphNode, $createRangeSelection } from 'lexical' -import { handleEditorChange } from '@standardnotes/blocks-editor/src/Editor/Utils' +import { handleEditorChange } from '../../Utils' import { SuperNotePreviewCharLimit } from '../../SuperEditor' /** Note that markdown conversion does not insert new lines. See: https://github.com/facebook/lexical/issues/2815 */ diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemBubblePlugin/ItemBubblePlugin.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/ItemBubblePlugin.ts similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemBubblePlugin/ItemBubblePlugin.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/ItemBubblePlugin.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleComponent.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleComponent.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleComponent.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleComponent.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleNode.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleNode.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleNode.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleNode.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleUtils.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleUtils.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleUtils.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleUtils.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemBubblePlugin/Nodes/SerializedBubbleNode.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/SerializedBubbleNode.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemBubblePlugin/Nodes/SerializedBubbleNode.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/SerializedBubbleNode.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemNodeInterface.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemNodeInterface.ts similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemNodeInterface.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemNodeInterface.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/ItemOption.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemOption.ts similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/ItemOption.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemOption.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionItemComponent.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionItemComponent.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionItemComponent.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionItemComponent.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionPlugin.tsx similarity index 97% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionPlugin.tsx index 0acf02cac..32501dc09 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionPlugin.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionPlugin.tsx @@ -9,7 +9,7 @@ import { ContentType, SNNote } from '@standardnotes/snjs' import { getLinkingSearchResults } from '@/Utils/Items/Search/getSearchResults' import Popover from '@/Components/Popover/Popover' import { INSERT_BUBBLE_COMMAND, INSERT_FILE_COMMAND } from '../Commands' -import { useLinkingController } from '../../../../../Controllers/LinkingControllerProvider' +import { useLinkingController } from '../../../../Controllers/LinkingControllerProvider' import { PopoverClassNames } from '../ClassNames' import { isMobileScreen } from '@/Utils' import { useTypeaheadAllowingSpacesAndPunctuation } from './useTypeaheadAllowingSpacesAndPunctuation' diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/useTypeaheadAllowingSpacesAndPunctuation.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/useTypeaheadAllowingSpacesAndPunctuation.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/useTypeaheadAllowingSpacesAndPunctuation.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/useTypeaheadAllowingSpacesAndPunctuation.tsx diff --git a/packages/blocks-editor/src/Lexical/Plugins/ListMaxIndentLevelPlugin/index.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ListMaxIndentLevelPlugin/index.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/ListMaxIndentLevelPlugin/index.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ListMaxIndentLevelPlugin/index.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/MarkdownPreviewPlugin/MarkdownPreviewPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/MarkdownPreviewPlugin/MarkdownPreviewPlugin.tsx similarity index 92% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/MarkdownPreviewPlugin/MarkdownPreviewPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/MarkdownPreviewPlugin/MarkdownPreviewPlugin.tsx index c18a092c7..f96c90487 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/MarkdownPreviewPlugin/MarkdownPreviewPlugin.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/MarkdownPreviewPlugin/MarkdownPreviewPlugin.tsx @@ -3,7 +3,7 @@ import { useEffect } from 'react' import { $createCodeNode } from '@lexical/code' import { $createTextNode, $getRoot } from 'lexical' import { $convertToMarkdownString } from '@lexical/markdown' -import { MarkdownTransformers } from '@standardnotes/blocks-editor' +import { MarkdownTransformers } from '../../MarkdownTransformers' type Props = { onMarkdown: (markdown: string) => void diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/MobileToolbarPlugin/MobileToolbarPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/MobileToolbarPlugin/MobileToolbarPlugin.tsx similarity index 95% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/MobileToolbarPlugin/MobileToolbarPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/MobileToolbarPlugin/MobileToolbarPlugin.tsx index 7899932de..e13ad9d99 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/MobileToolbarPlugin/MobileToolbarPlugin.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/MobileToolbarPlugin/MobileToolbarPlugin.tsx @@ -1,9 +1,9 @@ import Icon from '@/Components/Icon/Icon' import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' -import useModal from '@standardnotes/blocks-editor/src/Lexical/Hooks/useModal' -import { InsertTableDialog } from '@standardnotes/blocks-editor/src/Lexical/Plugins/TablePlugin' -import { getSelectedNode } from '@standardnotes/blocks-editor/src/Lexical/Utils/getSelectedNode' -import { sanitizeUrl } from '@standardnotes/blocks-editor/src/Lexical/Utils/sanitizeUrl' +import useModal from '../../Lexical/Hooks/useModal' +import { InsertTableDialog } from '../../Plugins/TablePlugin' +import { getSelectedNode } from '../../Lexical/Utils/getSelectedNode' +import { sanitizeUrl } from '../../Lexical/Utils/sanitizeUrl' import { $getSelection, $isRangeSelection, FORMAT_TEXT_COMMAND } from 'lexical' import { $isLinkNode, TOGGLE_LINK_COMMAND } from '@lexical/link' import { useCallback, useEffect, useMemo, useRef, useState } from 'react' diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/NodeObserverPlugin/NodeObserverPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/NodeObserverPlugin/NodeObserverPlugin.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/NodeObserverPlugin/NodeObserverPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/NodeObserverPlugin/NodeObserverPlugin.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/PasswordPlugin/Generator.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/PasswordPlugin/Generator.ts similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/PasswordPlugin/Generator.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/PasswordPlugin/Generator.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/PasswordPlugin/PasswordPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/PasswordPlugin/PasswordPlugin.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/PasswordPlugin/PasswordPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/PasswordPlugin/PasswordPlugin.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ReadonlyPlugin/ReadonlyPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ReadonlyPlugin/ReadonlyPlugin.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ReadonlyPlugin/ReadonlyPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/ReadonlyPlugin/ReadonlyPlugin.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/Context.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/Context.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/Context.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/Context.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchDialog.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/SearchDialog.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchDialog.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/SearchDialog.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/SearchPlugin.tsx similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/SearchPlugin.tsx diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/Types.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/Types.ts similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/Types.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/Types.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/createSearchHighlightElement.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/createSearchHighlightElement.ts similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/createSearchHighlightElement.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/createSearchHighlightElement.ts diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/getAllTextNodesInElement.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/getAllTextNodesInElement.ts similarity index 100% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/getAllTextNodesInElement.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/SearchPlugin/getAllTextNodesInElement.ts diff --git a/packages/blocks-editor/src/Lexical/Plugins/TabIndentationPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/TabIndentationPlugin.tsx similarity index 100% rename from packages/blocks-editor/src/Lexical/Plugins/TabIndentationPlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/TabIndentationPlugin.tsx diff --git a/packages/blocks-editor/src/Lexical/Plugins/TablePlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/TablePlugin.tsx similarity index 95% rename from packages/blocks-editor/src/Lexical/Plugins/TablePlugin.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/TablePlugin.tsx index 179e6d568..c22dde2ce 100644 --- a/packages/blocks-editor/src/Lexical/Plugins/TablePlugin.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/TablePlugin.tsx @@ -25,12 +25,11 @@ import { } from 'lexical' import { createContext, useContext, useEffect, useMemo, useState } from 'react' import * as React from 'react' -import invariant from '../Shared/invariant' - -import { $createTableNodeWithDimensions, TableNode } from '../Nodes/TableNode' -import Button from '../UI/Button' -import { DialogActions } from '../UI/Dialog' -import TextInput from '../UI/TextInput' +import invariant from '../Lexical/Shared/invariant' +import { $createTableNodeWithDimensions, TableNode } from '../Lexical/Nodes/TableNode' +import Button from '../Lexical/UI/Button' +import { DialogActions } from '../Lexical/UI/Dialog' +import TextInput from '../Lexical/UI/TextInput' export type InsertTableCommandPayload = Readonly<{ columns: string diff --git a/packages/blocks-editor/src/Lexical/Plugins/TwitterPlugin/index.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/TwitterPlugin/index.ts similarity index 93% rename from packages/blocks-editor/src/Lexical/Plugins/TwitterPlugin/index.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/TwitterPlugin/index.ts index 40eb59af9..275c5ff46 100644 --- a/packages/blocks-editor/src/Lexical/Plugins/TwitterPlugin/index.ts +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/TwitterPlugin/index.ts @@ -11,7 +11,7 @@ import { $insertNodeToNearestRoot } from '@lexical/utils' import { COMMAND_PRIORITY_EDITOR, createCommand, LexicalCommand } from 'lexical' import { useEffect } from 'react' -import { $createTweetNode, TweetNode } from '../../Nodes/TweetNode' +import { $createTweetNode, TweetNode } from '../../Lexical/Nodes/TweetNode' export const INSERT_TWEET_COMMAND: LexicalCommand = createCommand('INSERT_TWEET_COMMAND') diff --git a/packages/blocks-editor/src/Lexical/Plugins/YouTubePlugin/index.ts b/packages/web/src/javascripts/Components/SuperEditor/Plugins/YouTubePlugin/index.ts similarity index 93% rename from packages/blocks-editor/src/Lexical/Plugins/YouTubePlugin/index.ts rename to packages/web/src/javascripts/Components/SuperEditor/Plugins/YouTubePlugin/index.ts index 7c23b34a4..1bec5972d 100644 --- a/packages/blocks-editor/src/Lexical/Plugins/YouTubePlugin/index.ts +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/YouTubePlugin/index.ts @@ -11,7 +11,7 @@ import { $insertNodeToNearestRoot } from '@lexical/utils' import { COMMAND_PRIORITY_EDITOR, createCommand, LexicalCommand } from 'lexical' import { useEffect } from 'react' -import { $createYouTubeNode, YouTubeNode } from '../../Nodes/YouTubeNode' +import { $createYouTubeNode, YouTubeNode } from '../../Lexical/Nodes/YouTubeNode' export const INSERT_YOUTUBE_COMMAND: LexicalCommand = createCommand('INSERT_YOUTUBE_COMMAND') diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperEditor.tsx b/packages/web/src/javascripts/Components/SuperEditor/SuperEditor.tsx similarity index 94% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperEditor.tsx rename to packages/web/src/javascripts/Components/SuperEditor/SuperEditor.tsx index 24b50a2fe..01190bfb3 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperEditor.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/SuperEditor.tsx @@ -8,14 +8,15 @@ import { PrefKey, } from '@standardnotes/snjs' import { FunctionComponent, useCallback, useEffect, useRef, useState } from 'react' -import { BlocksEditor, BlocksEditorComposer } from '@standardnotes/blocks-editor' +import { BlocksEditor } from './BlocksEditor' +import { BlocksEditorComposer } from './BlocksEditorComposer' import { ItemSelectionPlugin } from './Plugins/ItemSelectionPlugin/ItemSelectionPlugin' import { FileNode } from './Plugins/EncryptedFilePlugin/Nodes/FileNode' import FilePlugin from './Plugins/EncryptedFilePlugin/FilePlugin' import BlockPickerMenuPlugin from './Plugins/BlockPickerPlugin/BlockPickerPlugin' import { ErrorBoundary } from '@/Utils/ErrorBoundary' import { LinkingController } from '@/Controllers/LinkingController' -import LinkingControllerProvider from '../../../Controllers/LinkingControllerProvider' +import LinkingControllerProvider from '../../Controllers/LinkingControllerProvider' import { BubbleNode } from './Plugins/ItemBubblePlugin/Nodes/BubbleNode' import ItemBubblePlugin from './Plugins/ItemBubblePlugin/ItemBubblePlugin' import { NodeObserverPlugin } from './Plugins/NodeObserverPlugin/NodeObserverPlugin' @@ -23,7 +24,7 @@ import { FilesController } from '@/Controllers/FilesController' import FilesControllerProvider from '@/Controllers/FilesControllerProvider' import DatetimePlugin from './Plugins/DateTimePlugin/DateTimePlugin' import AutoLinkPlugin from './Plugins/AutoLinkPlugin/AutoLinkPlugin' -import { NoteViewController } from '../Controller/NoteViewController' +import { NoteViewController } from '../NoteView/Controller/NoteViewController' import { ChangeContentCallbackPlugin, ChangeEditorFunction, @@ -42,7 +43,6 @@ import { SuperSearchContextProvider } from './Plugins/SearchPlugin/Context' import { SearchPlugin } from './Plugins/SearchPlugin/SearchPlugin' import ModalOverlay from '@/Components/Modal/ModalOverlay' import MobileToolbarPlugin from './Plugins/MobileToolbarPlugin/MobileToolbarPlugin' -import { SuperEditorNodes } from './SuperEditorNodes' import CodeOptionsPlugin from './Plugins/CodeOptionsPlugin/CodeOptions' export const SuperNotePreviewCharLimit = 160 @@ -170,11 +170,7 @@ export const SuperEditor: FunctionComponent = ({ - + { const headlessEditor = createHeadlessEditor({ @@ -13,7 +12,7 @@ export const exportSuperNote = (note: SNNote, format: 'txt' | 'md' | 'html' | 'j theme: BlocksEditorTheme, editable: false, onError: (error: Error) => console.error(error), - nodes: [...SuperEditorNodes, ...BlockEditorNodes], + nodes: [...BlockEditorNodes], }) headlessEditor.setEditorState(headlessEditor.parseEditorState(note.text)) diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperNoteImporter.tsx b/packages/web/src/javascripts/Components/SuperEditor/SuperNoteImporter.tsx similarity index 95% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperNoteImporter.tsx rename to packages/web/src/javascripts/Components/SuperEditor/SuperNoteImporter.tsx index f0c35eca5..9179a9d52 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperNoteImporter.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/SuperNoteImporter.tsx @@ -1,12 +1,13 @@ import { WebApplication } from '@/Application/Application' import { NoteType, SNNote } from '@standardnotes/snjs' import { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react' -import { BlocksEditor, BlocksEditorComposer } from '@standardnotes/blocks-editor' import { ErrorBoundary } from '@/Utils/ErrorBoundary' import ImportPlugin from './Plugins/ImportPlugin/ImportPlugin' -import { NoteViewController } from '../Controller/NoteViewController' +import { NoteViewController } from '../NoteView/Controller/NoteViewController' import { spaceSeparatedStrings } from '@standardnotes/utils' import Modal, { ModalAction } from '@/Components/Modal/Modal' +import { BlocksEditor } from './BlocksEditor' +import { BlocksEditorComposer } from './BlocksEditorComposer' const NotePreviewCharLimit = 160 diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperNoteMarkdownPreview.tsx b/packages/web/src/javascripts/Components/SuperEditor/SuperNoteMarkdownPreview.tsx similarity index 83% rename from packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperNoteMarkdownPreview.tsx rename to packages/web/src/javascripts/Components/SuperEditor/SuperNoteMarkdownPreview.tsx index 452d21312..86d591c2b 100644 --- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperNoteMarkdownPreview.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/SuperNoteMarkdownPreview.tsx @@ -1,12 +1,11 @@ import { SNNote } from '@standardnotes/snjs' import { FunctionComponent, useCallback, useMemo, useState } from 'react' -import { BlocksEditor, BlocksEditorComposer } from '@standardnotes/blocks-editor' import { ErrorBoundary } from '@/Utils/ErrorBoundary' import MarkdownPreviewPlugin from './Plugins/MarkdownPreviewPlugin/MarkdownPreviewPlugin' -import { FileNode } from './Plugins/EncryptedFilePlugin/Nodes/FileNode' -import { BubbleNode } from './Plugins/ItemBubblePlugin/Nodes/BubbleNode' -import { copyTextToClipboard } from '../../../Utils/copyTextToClipboard' +import { copyTextToClipboard } from '../../Utils/copyTextToClipboard' import Modal, { ModalAction } from '@/Components/Modal/Modal' +import { BlocksEditor } from './BlocksEditor' +import { BlocksEditorComposer } from './BlocksEditorComposer' type Props = { note: SNNote @@ -45,7 +44,7 @@ export const SuperNoteMarkdownPreview: FunctionComponent = ({ note, close
- + { diff --git a/packages/web/src/stylesheets/index.css.scss b/packages/web/src/stylesheets/index.css.scss index cac8bf16f..29e1c191b 100644 --- a/packages/web/src/stylesheets/index.css.scss +++ b/packages/web/src/stylesheets/index.css.scss @@ -1,4 +1,4 @@ -$blocks-editor-icons-path: '../../../blocks-editor/src/Lexical/Icons'; +$blocks-editor-icons-path: '../javascripts/Components/SuperEditor/Lexical/Icons'; @import '../../../styles/src/Styles/_colors.scss'; @import '../../../styles/src/Styles/_panels.scss'; @@ -20,14 +20,15 @@ $blocks-editor-icons-path: '../../../blocks-editor/src/Lexical/Icons'; @import 'focused'; @import 'sn'; @import 'animation'; -@import '../../../blocks-editor/src/Lexical/Theme/lexical.scss'; +@import '../javascripts/Components/SuperEditor/Lexical/Theme/lexical.scss'; @tailwind base; @tailwind components; @tailwind utilities; @layer base { - ul, ol { + ul, + ol { list-style-type: revert; } } diff --git a/packages/web/tailwind.config.js b/packages/web/tailwind.config.js index 63e7f1843..37c927c9c 100644 --- a/packages/web/tailwind.config.js +++ b/packages/web/tailwind.config.js @@ -3,7 +3,7 @@ const plugin = require('tailwindcss/plugin') module.exports = { - content: ['./src/javascripts/**/*.tsx', '../toast/src/**/*.tsx', '../blocks-editor/src/**/*'], + content: ['./src/javascripts/**/*.tsx', '../toast/src/**/*.tsx'], theme: { extend: { spacing: { diff --git a/yarn.lock b/yarn.lock index ecb95844d..a9698a2a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4463,26 +4463,6 @@ __metadata: languageName: node linkType: hard -"@standardnotes/blocks-editor@workspace:*, @standardnotes/blocks-editor@workspace:packages/blocks-editor": - version: 0.0.0-use.local - resolution: "@standardnotes/blocks-editor@workspace:packages/blocks-editor" - dependencies: - "@lexical/react": 0.8.0 - "@standardnotes/icons": "workspace:*" - "@types/react": ^18.0.26 - "@types/react-dom": ^18.0.9 - eslint: "*" - eslint-plugin-react: "*" - eslint-plugin-react-hooks: "*" - lexical: 0.8.0 - prettier: "*" - prettier-plugin-tailwindcss: "*" - react: ^18.2.0 - react-dom: ^18.2.0 - typescript: "*" - languageName: unknown - linkType: soft - "@standardnotes/bold-editor@npm:^1.6.4": version: 1.6.4 resolution: "@standardnotes/bold-editor@npm:1.6.4" @@ -5273,7 +5253,6 @@ __metadata: "@simplewebauthn/browser": ^7.0.0 "@standardnotes/authenticator": ^2.3.9 "@standardnotes/autobiography-theme": ^1.2.7 - "@standardnotes/blocks-editor": "workspace:*" "@standardnotes/bold-editor": ^1.6.4 "@standardnotes/classic-code-editor": ^1.5.7 "@standardnotes/dynamic-theme": ^1.2.8 @@ -10969,7 +10948,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react-hooks@npm:*, eslint-plugin-react-hooks@npm:^4.6.0": +"eslint-plugin-react-hooks@npm:^4.6.0": version: 4.6.0 resolution: "eslint-plugin-react-hooks@npm:4.6.0" peerDependencies: @@ -10997,31 +10976,6 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react@npm:*": - version: 7.32.0 - resolution: "eslint-plugin-react@npm:7.32.0" - dependencies: - array-includes: ^3.1.6 - array.prototype.flatmap: ^1.3.1 - array.prototype.tosorted: ^1.1.1 - doctrine: ^2.1.0 - estraverse: ^5.3.0 - jsx-ast-utils: ^2.4.1 || ^3.0.0 - minimatch: ^3.1.2 - object.entries: ^1.1.6 - object.fromentries: ^2.0.6 - object.hasown: ^1.1.2 - object.values: ^1.1.6 - prop-types: ^15.8.1 - resolve: ^2.0.0-next.4 - semver: ^6.3.0 - string.prototype.matchall: ^4.0.8 - peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: b81ce2623b50a936287d8e21997bd855094e643856c99b42a9f0c10e1c7b123e469c3d75f77df9eefb719fee2b47a763862f1cdca1e7cc26edc7cde2fb8cba87 - languageName: node - linkType: hard - "eslint-plugin-react@npm:^7.30.1": version: 7.31.10 resolution: "eslint-plugin-react@npm:7.31.10" @@ -18599,7 +18553,7 @@ __metadata: languageName: node linkType: hard -"prettier-plugin-tailwindcss@npm:*, prettier-plugin-tailwindcss@npm:^0.2.1": +"prettier-plugin-tailwindcss@npm:^0.2.1": version: 0.2.1 resolution: "prettier-plugin-tailwindcss@npm:0.2.1" peerDependencies: @@ -19830,7 +19784,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^2.0.0-next.3, resolve@npm:^2.0.0-next.4": +"resolve@npm:^2.0.0-next.3": version: 2.0.0-next.4 resolution: "resolve@npm:2.0.0-next.4" dependencies: @@ -19856,7 +19810,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^2.0.0-next.3#~builtin, resolve@patch:resolve@^2.0.0-next.4#~builtin": +"resolve@patch:resolve@^2.0.0-next.3#~builtin": version: 2.0.0-next.4 resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin::version=2.0.0-next.4&hash=07638b" dependencies: