From cc19e45cafeb65e3eda73677aa42d8332bb0a369 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Mon, 31 Jan 2022 22:01:48 -0800 Subject: [PATCH] fix: list editing regression (#3041) * working state * Selective deps upgrade, still working * Update more deps, still working * fix: Tweak checkbox items too bright while we're here * Avoid prosemirror-view downgrade --- app/editor/components/Styles.ts | 2 ++ package.json | 17 ++++++++--------- yarn.lock | 28 ++++++++++++++-------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/app/editor/components/Styles.ts b/app/editor/components/Styles.ts index 115de376e..651e786b0 100644 --- a/app/editor/components/Styles.ts +++ b/app/editor/components/Styles.ts @@ -620,6 +620,7 @@ const EditorStyles = styled.div<{ position: relative; top: 1px; transition: transform 100ms ease-in-out; + opacity: .8; background-image: ${(props) => `url("data:image/svg+xml,%3Csvg width='14' height='14' viewBox='0 0 14 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M3 0C1.34315 0 0 1.34315 0 3V11C0 12.6569 1.34315 14 3 14H11C12.6569 14 14 12.6569 14 11V3C14 1.34315 12.6569 0 11 0H3ZM3 2C2.44772 2 2 2.44772 2 3V11C2 11.5523 2.44772 12 3 12H11C11.5523 12 12 11.5523 12 11V3C12 2.44772 11.5523 2 11 2H3Z' fill='${props.theme.text.replace( @@ -628,6 +629,7 @@ const EditorStyles = styled.div<{ )}' /%3E%3C/svg%3E%0A");`} &[aria-checked=true] { + opacity: 1; background-image: ${(props) => `url( "data:image/svg+xml,%3Csvg width='14' height='14' viewBox='0 0 14 14' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M3 0C1.34315 0 0 1.34315 0 3V11C0 12.6569 1.34315 14 3 14H11C12.6569 14 14 12.6569 14 11V3C14 1.34315 12.6569 0 11 0H3ZM4.26825 5.85982L5.95873 7.88839L9.70003 2.9C10.0314 2.45817 10.6582 2.36863 11.1 2.7C11.5419 3.03137 11.6314 3.65817 11.3 4.1L6.80002 10.1C6.41275 10.6164 5.64501 10.636 5.2318 10.1402L2.7318 7.14018C2.37824 6.71591 2.43556 6.08534 2.85984 5.73178C3.28412 5.37821 3.91468 5.43554 4.26825 5.85982Z' fill='${props.theme.primary.replace( diff --git a/package.json b/package.json index 657444819..753fab928 100644 --- a/package.json +++ b/package.json @@ -131,16 +131,16 @@ "pg": "^8.5.1", "pg-hstore": "^2.3.4", "polished": "^3.7.2", - "prosemirror-commands": "^1.1.6", - "prosemirror-dropcursor": "^1.3.3", - "prosemirror-gapcursor": "^1.1.5", - "prosemirror-history": "^1.1.3", + "prosemirror-commands": "^1.2.1", + "prosemirror-dropcursor": "^1.4.0", + "prosemirror-gapcursor": "^1.2.1", + "prosemirror-history": "^1.2.0", "prosemirror-inputrules": "^1.1.3", - "prosemirror-keymap": "^1.1.4", + "prosemirror-keymap": "^1.1.5", "prosemirror-markdown": "^1.5.2", - "prosemirror-model": "^1.13.3", - "prosemirror-schema-list": "^1.1.2", - "prosemirror-state": "^1.3.4", + "prosemirror-model": "1.16.1", + "prosemirror-schema-list": "1.1.4", + "prosemirror-state": "1.3.4", "prosemirror-tables": "^1.1.1", "prosemirror-transform": "1.2.5", "prosemirror-utils": "^0.9.6", @@ -315,7 +315,6 @@ "resolutions": { "socket.io-parser": "^3.4.0", "prosemirror-transform": "1.2.5", - "prosemirror-view": "1.22.0", "dot-prop": "^5.2.0", "js-yaml": "^3.14.1" }, diff --git a/yarn.lock b/yarn.lock index 4eb74db99..4a4772c54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11762,16 +11762,16 @@ property-information@^5.0.0: dependencies: xtend "^4.0.0" -prosemirror-commands@^1.1.6: - version "1.1.12" - resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.12.tgz#5cb0fef4e5a0039e2fa19b42a5626af03d7c2ec3" - integrity sha512-+CrMs3w/ZVPSkR+REg8KL/clyFLv/1+SgY/OMN+CB22Z24j9TZDje72vL36lOZ/E4NeRXuiCcmENcW/vAcG67A== +prosemirror-commands@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.2.1.tgz#eae0cb714df695260659b78ff5d201d3a037e50d" + integrity sha512-S/IkpXfpuLFsRynC2HQ5iYROUPiZskKS1+ClcWycGJvj4HMb/mVfeEkQrixYxgTl96EAh+RZQNWPC06GZXk5tQ== dependencies: prosemirror-model "^1.0.0" prosemirror-state "^1.0.0" prosemirror-transform "^1.0.0" -prosemirror-dropcursor@^1.3.3: +prosemirror-dropcursor@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.4.0.tgz#91a859d4ee79c99b1c0ba6ee61c093b195c0d9f0" integrity sha512-6+YwTjmqDwlA/Dm+5wK67ezgqgjA/MhSDgaNxKUzH97SmeuWFXyLeDRxxOPZeSo7yTxcDGUCWTEjmQZsVBuMrQ== @@ -11780,7 +11780,7 @@ prosemirror-dropcursor@^1.3.3: prosemirror-transform "^1.1.0" prosemirror-view "^1.1.0" -prosemirror-gapcursor@^1.1.5: +prosemirror-gapcursor@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.2.1.tgz#02365e1bcc1ad25d390b0fb7f0e94a7fc173ad75" integrity sha512-PHa9lj27iM/g4C46gxVzsefuXVfy/LrGQH4QjMRht7VDBgw77iWYWn8ZHMWSFkwtr9jQEuxI5gccHHHwWG80nw== @@ -11790,7 +11790,7 @@ prosemirror-gapcursor@^1.1.5: prosemirror-state "^1.0.0" prosemirror-view "^1.0.0" -prosemirror-history@^1.1.3: +prosemirror-history@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.2.0.tgz#04cc4df8d2f7b2a46651a2780de191ada6d465ea" integrity sha512-B9v9xtf4fYbKxQwIr+3wtTDNLDZcmMMmGiI3TAPShnUzvo+Rmv1GiUrsQChY1meetHl7rhML2cppF3FTs7f7UQ== @@ -11807,7 +11807,7 @@ prosemirror-inputrules@^1.1.3: prosemirror-state "^1.0.0" prosemirror-transform "^1.0.0" -prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.4: +prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.5.tgz#b5984c7d30f5c75956c853126c54e9e624c0327b" integrity sha512-8SZgPH3K+GLsHL2wKuwBD9rxhsbnVBTwpHCO4VUO5GmqUQlxd/2GtBVWTsyLq4Dp3N9nGgPd3+lZFKUDuVp+Vw== @@ -11823,22 +11823,22 @@ prosemirror-markdown@^1.5.2: markdown-it "^12.0.0" prosemirror-model "^1.0.0" -prosemirror-model@^1.0.0, prosemirror-model@^1.13.3, prosemirror-model@^1.14.3, prosemirror-model@^1.8.1: +prosemirror-model@1.16.1, prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.14.3, prosemirror-model@^1.8.1: version "1.16.1" resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.16.1.tgz#fb388270bc9609b66298d6a7e15d0cc1d6c61253" integrity sha512-r1/w0HDU40TtkXp0DyKBnFPYwd8FSlUSJmGCGFv4DeynfeSlyQF2FD0RQbVEMOe6P3PpUSXM6LZBV7W/YNZ4mA== dependencies: orderedmap "^1.1.0" -prosemirror-schema-list@^1.1.2: - version "1.1.6" - resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.6.tgz#c3e13fe2f74750e4a53ff88d798dc0c4ccca6707" - integrity sha512-aFGEdaCWmJzouZ8DwedmvSsL50JpRkqhQ6tcpThwJONVVmCgI36LJHtoQ4VGZbusMavaBhXXr33zyD2IVsTlkw== +prosemirror-schema-list@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz#471f9caf2d2bed93641d2e490434c0d2d4330df1" + integrity sha512-pNTuZflacFOBlxrTcWSdWhjoB8BaucwfJVp/gJNxztOwaN3wQiC65axclXyplf6TKgXD/EkWfS/QAov3/Znadw== dependencies: prosemirror-model "^1.0.0" prosemirror-transform "^1.0.0" -prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.3.4: +prosemirror-state@1.3.4, prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1: version "1.3.4" resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.4.tgz#4c6b52628216e753fc901c6d2bfd84ce109e8952" integrity sha512-Xkkrpd1y/TQ6HKzN3agsQIGRcLckUMA9u3j207L04mt8ToRgpGeyhbVv0HI7omDORIBHjR29b7AwlATFFf2GLA==