Merge branch 'master' into feat/db

package.json

@@ -18,7 +18,7 @@
         "del": "^6.0.0",
         "gulp": "^4.0.2",
         "gulp-clean-css": "^4.3.0",
-        "ip": "1.1.8",
+        "ip": "1.1.9",
         "npm-run-all": "^4.1.5",
         "playwright": "=1.31.0",
         "postcss": "8.4.17",

packages/ui/yarn.lock

@@ -6401,9 +6401,9 @@ invariant@^2.2.4:
     loose-envify "^1.0.0"
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 [email protected]:
   version "1.9.1"

resources/package.json

@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@fastify/cors": "8.2.0",
-    "@logseq/rsapi": "0.0.81",
+    "@logseq/rsapi": "0.0.84",
     "@sentry/electron": "2.5.1",
     "abort-controller": "3.0.0",
     "better-sqlite3": "9.3.0",

src/main/frontend/components/block.cljs

@@ -1904,10 +1904,8 @@
     :on-change (fn [event]
                  (let [target (.-target event)
                        block (:block config)
-                       item-content (.. target -nextSibling -data)
-                       item-full-content (str (if checked? "[X]" "[ ]") " " item-content)
-                       new-item-full-content (str (if checked? "[ ]" "[X]") " " item-content)]
-                   (editor-handler/toggle-list-checkbox block item-full-content new-item-full-content)))}))
+                       item-content (.. target -nextSibling -data)]
+                   (editor-handler/toggle-list-checkbox block item-content)))}))
 
 (defn marker-switch
   [{:block/keys [marker] :as block}]

src/main/frontend/handler/editor.cljs

@@ -54,6 +54,7 @@
             [goog.dom.classes :as gdom-classes]
             [goog.object :as gobj]
             [goog.crypt.base64 :as base64]
+            [goog.string :as gstring]
             [lambdaisland.glogi :as log]
             [logseq.db.frontend.schema :as db-schema]
             [logseq.graph-parser.block :as gp-block]
@@ -2399,8 +2400,14 @@
             (insert "\n")))))))
 
 (defn toggle-list-checkbox
-  [{:block/keys [content] :as block} old-item-content new-item-content]
-  (let [new-content (string/replace-first content old-item-content new-item-content)]
+  [{:block/keys [content] :as block} item-content]
+  (let [toggle-fn (fn [m x-mark]
+                    (case (string/lower-case x-mark)
+                      "[ ]" (str "[x] " item-content)
+                      "[x]" (str "[ ] " item-content)
+                      m))
+        pattern (re-pattern (str "(\\[[xX ]\\])\\s+?" (gstring/regExpEscape item-content)))
+        new-content (string/replace-first content pattern toggle-fn)]
     (save-block-if-changed! block new-content)))
 
 (defn- dwim-in-list

src/resources/dicts/tr.edn

@@ -234,7 +234,7 @@
  :editor/expand-block-children "Tümünü genişlet"
  :editor/collapse-block-children "Tümünü daralt"
  :editor/delete-selection "Seçili blokları sil"
- :editor/cycle-todo "Geçerli öğenin TODO durumunu döndür"
+ :editor/cycle-todo "TODO durumunu değiştir"
  :dev/show-page-data "(Dev) Sayfa verisini göster"
  :dev/show-block-data "(Dev) Blok verisini göster"
  :dev/show-block-ast "(Dev) Blok AST'sini göster"
@@ -687,7 +687,7 @@
  :command.editor/replace-block-reference-at-point "Blok referansını bu konumdaki içeriğiyle değiştirin"
  :command.editor/paste-text-in-one-block-at-point "İmleç konumunda metin olarak yapıştırın"
  :command.editor/insert-youtube-timestamp         "Youtube zaman damgası ekle"
- :command.editor/cycle-todo              "Geçerli öğenin TODO durumunu değiştir"
+ :command.editor/cycle-todo              "TODO durumunu değiştir"
  :command.editor/up                      "İmleci yukarı taşı / Yukarıyı seç"
  :command.editor/down                    "İmleci aşağı taşı / Aşağı seç"
  :command.editor/left                    "İmleci sola hareket ettir / Seçili bloğu aç ve başına git"
@@ -702,6 +702,7 @@
  :command.editor/delete-selection        "Seçili blokları sil"
  :command.editor/expand-block-children   "Genişlet"
  :command.editor/collapse-block-children "Daralt"
+ :command.editor/toggle-block-children   "Genişlet veya daralt"
  :command.editor/indent                  "Bloğu girintile"
  :command.editor/outdent                 "Blok girintisini azalt"
  :command.editor/copy                    "Kopyala (seçimi veya blok referansını kopyalar)"
@@ -781,6 +782,8 @@
  :command.ui/toggle-help                 "Yardımı aç/kapat"
  :command.ui/toggle-theme                "Koyu ve açık tema arasında geçiş yap"
  :command.ui/toggle-contents             "Kenar çubuğundaki içeriği aç/kapat"
+ :command.ui/accent-color-reset          "Vurgu rengini sıfırla"
+ :command.ui/accent-colors-picker        "Vurgu rengini seç"
  :command.command/toggle-favorite        "Sık kullanılanlara ekle/çıkar"
  :command.editor/open-file-in-default-app "Dosyayı varsayılan uygulamada aç"
  :command.editor/open-file-in-directory   "Dosyayı üst dizinde aç"

static/yarn.lock

@@ -400,47 +400,47 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@logseq/[email protected]1":
-  version "0.0.81"
-  resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-arm64/-/rsapi-darwin-arm64-0.0.81.tgz#1ac2660fb54d313e6aa8553c75e3b31415356e4f"
-  integrity sha512-f6Npp9kUWC0nV9g6THWl60VrVbWRuQjsixYBq8a0/4MwruHamFqauVWkCk4iUNw6htw8wZfHVHUIgiwAg3hibw==
-
-"@logseq/[email protected]1":
-  version "0.0.81"
-  resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-x64/-/rsapi-darwin-x64-0.0.81.tgz#8879b16db494cc67902a21eb5136d67b9bba6141"
-  integrity sha512-LTqyXSpbWJlAAJ8NtNzT/t+8gL/wgU+PXFtw8VAwD9TrsKl8I+gjzmTJf0Y6Ej8BACRGTusyelh7BAGoeLKHqg==
-
-"@logseq/[email protected]1":
-  version "0.0.81"
-  resolved "https://registry.yarnpkg.com/@logseq/rsapi-freebsd-x64/-/rsapi-freebsd-x64-0.0.81.tgz#99d7c8de99f8ffa9b4fd33d972fda971d137298c"
-  integrity sha512-e+MAt8K0uztIk7FtAHRsKFX9bqqBr2zJEZBCMUnguBB9ezx/dCF2OJXPB38Aw6Is8lJcfb8ZxewJj0AsIwBPJw==
-
-"@logseq/[email protected]1":
-  version "0.0.81"
-  resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-arm64-gnu/-/rsapi-linux-arm64-gnu-0.0.81.tgz#9de9bf394dfdc26545a4537506f8498a5cc06fdd"
-  integrity sha512-m5H1xFcovCbp2fs47dICxA5pZCQUV0t5lJfeHZjNsYniXKADIdEry9U6jef8GTAI73ABXTpjQ3L1oq2W7QsmBA==
-
-"@logseq/[email protected]1":
-  version "0.0.81"
-  resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-x64-gnu/-/rsapi-linux-x64-gnu-0.0.81.tgz#f5a090fa34892cd7ec2ea81fcf67b4f4fb1e9ade"
-  integrity sha512-QW7QRkkaB9CUP4tgbv2hUbSBd/wTd5FWSg+qoKe/k0hydtaD6JsP1uMQuTdkvwxbi8735PMvuB4Q5p01+cGpRQ==
-
-"@logseq/[email protected]1":
-  version "0.0.81"
-  resolved "https://registry.yarnpkg.com/@logseq/rsapi-win32-x64-msvc/-/rsapi-win32-x64-msvc-0.0.81.tgz#baa0f4ac5978ed27d3771a01f7b4ee7cc5bfd15d"
-  integrity sha512-hTdE8H6URdN0Y6B2gEnCDeEFDlgpEMydvnCDiJEOBNugsuue0AGB5phGn/DaxQ7t9S1KH+YPBRzxb+oPU6hMrQ==
-
-"@logseq/[email protected]1":
-  version "0.0.81"
-  resolved "https://registry.yarnpkg.com/@logseq/rsapi/-/rsapi-0.0.81.tgz#665b3a87a2bca08b2755865c9cc9d5e584b17e8d"
-  integrity sha512-tzUk2y9TVJlY6ZlA6tSDOQ+/n2bdbrNPX+A7SintnJXhsyJLXhszLcnWJU1dIj2pf7pcAcYoPv1aZYfp4re5qw==
+"@logseq/[email protected]4":
+  version "0.0.84"
+  resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-arm64/-/rsapi-darwin-arm64-0.0.84.tgz#66dffca19b58ba825d1ac6a9435302719c601d7e"
+  integrity sha512-jqEUDEAqPCA8QmVTC8ATA9qeEIMYS956zQw3THsCuLeztY2v/eAOADfPuYZx0ohJ3f3kk4sf+CRxyaTTT6+mxg==
+
+"@logseq/[email protected]4":
+  version "0.0.84"
+  resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-x64/-/rsapi-darwin-x64-0.0.84.tgz#ed4ddd8bf3268bc06f7ef6f738d09de59c64cf21"
+  integrity sha512-LPiaIdUyTmRyN8ZlcdLY4mBvuOwpv9dLkso+dE/OzhyBcDwINDlzjHHgP865c2ZS18TY1+82sPek6PMpcSNaUQ==
+
+"@logseq/[email protected]4":
+  version "0.0.84"
+  resolved "https://registry.yarnpkg.com/@logseq/rsapi-freebsd-x64/-/rsapi-freebsd-x64-0.0.84.tgz#703220ed9478cd4157ade56cc3a8d511dfa6c40e"
+  integrity sha512-6rGIbENiMBq0yY84XuJ3v2QtBGWivYS6LOtXsvPEx/1nOQPoYZKEWHINM1Tfe7hMDMgC7veTetOzW4itBtUpjQ==
+
+"@logseq/[email protected]4":
+  version "0.0.84"
+  resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-arm64-gnu/-/rsapi-linux-arm64-gnu-0.0.84.tgz#6e8d4b81b118b9389bf848d3754cf02419618819"
+  integrity sha512-J45FVj1DgS2VX22vtkA6z9t251sw/D9oEE0Ptq33SBX33bqOfr5nn+PYAKMSPdNtd17LoRV1gm3XC8qYE6apOA==
+
+"@logseq/[email protected]4":
+  version "0.0.84"
+  resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-x64-gnu/-/rsapi-linux-x64-gnu-0.0.84.tgz#3b07249a76025d8df76c2f4656b627b0f8bd10fd"
+  integrity sha512-TiUlIohmd6HU682dfDIs70mkxk3UB2rVO0M09ZWRLUXP6C6+bd1d93vif2VBqJWqx1pTLW6tLXfRHybN2gdD4Q==
+
+"@logseq/[email protected]4":
+  version "0.0.84"
+  resolved "https://registry.yarnpkg.com/@logseq/rsapi-win32-x64-msvc/-/rsapi-win32-x64-msvc-0.0.84.tgz#944d7141a2b532d73f501d948c58d57d14c7747d"
+  integrity sha512-nsEjYfp1KzO0YpSE6q9qQc3Vl1XNbpUrtznCQy7JPmyICxxV4k2plehUd+JTj7AeXHLusAxOqBg3G7lcUQTbkQ==
+
+"@logseq/[email protected]4":
+  version "0.0.84"
+  resolved "https://registry.yarnpkg.com/@logseq/rsapi/-/rsapi-0.0.84.tgz#e07aff30d10174dcad1ca9e0e56610841a940aa9"
+  integrity sha512-+Hz/KLq9J7mfHAFTZ14GIcKuJt7Z6guNhwxyZTd4w8D86MNKQrvR7oab8anNX4/da4OKZWJpks7bFog+lkF9EA==
   optionalDependencies:
-    "@logseq/rsapi-darwin-arm64" "0.0.81"
-    "@logseq/rsapi-darwin-x64" "0.0.81"
-    "@logseq/rsapi-freebsd-x64" "0.0.81"
-    "@logseq/rsapi-linux-arm64-gnu" "0.0.81"
-    "@logseq/rsapi-linux-x64-gnu" "0.0.81"
-    "@logseq/rsapi-win32-x64-msvc" "0.0.81"
+    "@logseq/rsapi-darwin-arm64" "0.0.84"
+    "@logseq/rsapi-darwin-x64" "0.0.84"
+    "@logseq/rsapi-freebsd-x64" "0.0.84"
+    "@logseq/rsapi-linux-arm64-gnu" "0.0.84"
+    "@logseq/rsapi-linux-x64-gnu" "0.0.84"
+    "@logseq/rsapi-win32-x64-msvc" "0.0.84"
 
 "@malept/cross-spawn-promise@^1.0.0", "@malept/cross-spawn-promise@^1.1.0":
   version "1.1.1"

yarn.lock

@@ -2843,13 +2843,14 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50:
-  version "0.10.62"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
-  integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.62, es5-ext@~0.10.14:
+  version "0.10.63"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.63.tgz#9c222a63b6a332ac80b1e373b426af723b895bd6"
+  integrity sha512-hUCZd2Byj/mNKjfP9jXrdVZ62B8KuA/VoK7X8nUh5qT+AxDmcbvZz041oDVZdbIN1qW6XY9VDNwzkvKnZvK2TQ==
   dependencies:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.3"
+    esniff "^2.0.1"
     next-tick "^1.1.0"
 
 es6-error@^4.1.1:
@@ -2909,6 +2910,24 @@ esm@^3.2.25:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
+esniff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
+  integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.62"
+    event-emitter "^0.3.5"
+    type "^2.7.2"
+
+event-emitter@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
 eventemitter3@^3.1.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
@@ -4004,10 +4023,10 @@ invert-kv@^2.0.0:
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
[email protected].8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
-  integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
[email protected].9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396"
+  integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==
 
 is-absolute@^1.0.0:
   version "1.0.0"