Skip to content

Commit

Permalink
fix: react key warning
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiensonqin
tiensonqin committed Dec 30, 2024
1 parent 985365a commit c75efab
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 40 deletions.
18 changes: 10 additions & 8 deletions deps/shui/src/logseq/shui/base/core.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns logseq.shui.base.core
(:require [logseq.shui.util :as util]
(:require [cljs-bean.core :as bean]
[logseq.shui.icon.v2 :as tabler-icon]
[cljs-bean.core :as bean]))
[logseq.shui.util :as util]))

(def button-base (util/lsui-wrap "Button" {:static? false}))
(def link (util/lsui-wrap "Link"))
Expand Down Expand Up @@ -52,12 +52,14 @@
(defn button-icon
[variant icon-name {:keys [icon-props size] :as props} child]
(button (merge (dissoc props :icon-props :size)
{:variant variant
:data-button :icon
:style (when size {:width size :height size})})
[:<>
(tabler-icon/root (name icon-name) (merge {:size 20} icon-props)) child]))
(button
(merge (dissoc props :icon-props :size)
{:variant variant
:data-button :icon
:style (when size {:width size :height size})})
(tabler-icon/root (name icon-name) (merge {:size 20
:key "icon"} icon-props))
child))
(def button-ghost-icon (partial button-icon :ghost))
(def button-outline-icon (partial button-icon :outline))
Expand Down
65 changes: 36 additions & 29 deletions src/main/frontend/components/container.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@
(ns frontend.components.container
(:require [cljs-drag-n-drop.core :as dnd]
[clojure.string :as string]
[frontend.version :refer [version]]
[dommy.core :as d]
[electron.ipc :as ipc]
[frontend.components.block :as block]
[frontend.components.content :as cp-content]
[frontend.components.dnd :as dnd-component]
[frontend.components.find-in-page :as find-in-page]
[frontend.components.handbooks :as handbooks]
[frontend.components.header :as header]
[frontend.components.icon :as icon]
[frontend.components.journal :as journal]
[frontend.components.plugins :as plugins]
[frontend.components.repo :as repo]
[frontend.components.right-sidebar :as right-sidebar]
[frontend.components.theme :as theme]
[frontend.components.dnd :as dnd-component]
[frontend.components.icon :as icon]
[frontend.components.handbooks :as handbooks]
[frontend.components.block :as block]
[dommy.core :as d]
[frontend.components.content :as cp-content]
[frontend.components.window-controls :as window-controls]
[frontend.config :as config]
[frontend.context.i18n :refer [t tt]]
[frontend.db :as db]
[electron.ipc :as ipc]
[frontend.db-mixins :as db-mixins]
[frontend.db.model :as db-model]
[frontend.extensions.fsrs :as fsrs]
[frontend.extensions.pdf.utils :as pdf-utils]
[frontend.storage :as storage]
[frontend.handler.block :as block-handler]
[frontend.handler.common :as common-handler]
[frontend.handler.editor :as editor-handler]
[frontend.handler.page :as page-handler]
[frontend.util.page :as page-util]
[frontend.handler.recent :as recent-handler]
[frontend.handler.route :as route-handler]
[frontend.handler.user :as user-handler]
[frontend.handler.whiteboard :as whiteboard-handler]
[frontend.handler.recent :as recent-handler]
[frontend.handler.block :as block-handler]
[frontend.mixins :as mixins]
[frontend.mobile.action-bar :as action-bar]
[frontend.mobile.footer :as footer]
Expand All @@ -40,24 +39,25 @@
[frontend.modules.shortcut.data-helper :as shortcut-dh]
[frontend.modules.shortcut.utils :as shortcut-utils]
[frontend.state :as state]
[frontend.storage :as storage]
[frontend.ui :as ui]
[logseq.shui.ui :as shui]
[logseq.shui.toaster.core :as shui-toaster]
[logseq.shui.dialog.core :as shui-dialog]
[logseq.shui.popup.core :as shui-popup]
[frontend.util :as util]
[frontend.util.cursor :as cursor]
[frontend.components.window-controls :as window-controls]
[medley.core :as medley]
[frontend.util.page :as page-util]
[frontend.version :refer [version]]
[goog.dom :as gdom]
[goog.object :as gobj]
[logseq.common.path :as path]
[logseq.common.util.namespace :as ns-util]
[logseq.db :as ldb]
[logseq.shui.dialog.core :as shui-dialog]
[logseq.shui.popup.core :as shui-popup]
[logseq.shui.toaster.core :as shui-toaster]
[logseq.shui.ui :as shui]
[medley.core :as medley]
[react-draggable]
[reitit.frontend.easy :as rfe]
[rum.core :as rum]
[logseq.db :as ldb]
[frontend.extensions.fsrs :as fsrs]
[logseq.common.util.namespace :as ns-util]))
[rum.core :as rum]))

(rum/defc sidebar-content-group < rum/reactive
[name {:keys [class count more header-props enter-show-more? collapsable?]} child]
Expand Down Expand Up @@ -99,7 +99,8 @@
[:<>
(when-not recent?
(x-menu-item
{:on-click #(page-handler/<unfavorite-page! (if db-based? (str (:block/uuid page)) title))}
{:key "unfavorite"
:on-click #(page-handler/<unfavorite-page! (if db-based? (str (:block/uuid page)) title))}
(ctx-icon "star-off")
(t :page/unfavorite)
(x-menu-shortcut (when-let [binding (shortcut-dh/shortcut-binding :command/toggle-favorite)]
Expand All @@ -110,16 +111,19 @@
(config/get-repo-fpath (state/get-current-repo) file-rpath))]
[:<>
(x-menu-item
{:on-click #(ipc/ipc :openFileInFolder page-fpath)}
{:key "open-in-folder"
:on-click #(ipc/ipc :openFileInFolder page-fpath)}
(ctx-icon "folder")
(t :page/open-in-finder))

(x-menu-item
{:on-click #(js/window.apis.openPath page-fpath)}
{:key "open with default app"
:on-click #(js/window.apis.openPath page-fpath)}
(ctx-icon "file")
(t :page/open-with-default-app))])
(x-menu-item
{:on-click open-in-sidebar}
{:key "open in sidebar"
:on-click open-in-sidebar}
(ctx-icon "layout-sidebar-right")
(t :content/open-in-sidebar)
(x-menu-shortcut (shortcut-utils/decorate-binding "shift+click")))]))]
Expand Down Expand Up @@ -169,7 +173,8 @@
(defn sidebar-item
[{:keys [on-click-handler class title icon icon-extension? active href shortcut more]}]
[:div
{:class (util/classnames [class {:active active}])}
{:key class
:class (util/classnames [class {:active active}])}
[:a.item.group.flex.items-center.text-sm.rounded-md.font-medium
{:on-click on-click-handler
:class (when active "active")
Expand Down Expand Up @@ -433,7 +438,8 @@

[:<>
[:div.left-sidebar-inner.flex-1.flex.flex-col.min-h-0
{:ref ref-el
{:key "left-sidebar"
:ref ref-el
:style (cond-> {}
(and (number? offset-ratio)
(> touching-x-offset 0))
Expand Down Expand Up @@ -474,7 +480,8 @@
(sidebar-recent-pages))]]]

[:span.shade-mask
(cond-> {:on-click close-fn}
(cond-> {:on-click close-fn
:key "shade-mask"}
(number? offset-ratio)
(assoc :style {:opacity (cond-> offset-ratio
(neg? offset-ratio)
Expand Down
8 changes: 5 additions & 3 deletions src/main/frontend/components/journal.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
[frontend.db :as db]
[frontend.db-mixins :as db-mixins]
[frontend.handler.page :as page-handler]
[frontend.mixins :as mixins]
[frontend.state :as state]
[rum.core :as rum]
[frontend.util :as util]
[goog.functions :refer [debounce]]
[frontend.mixins :as mixins]))
[rum.core :as rum]))

(rum/defc journal-cp < rum/reactive
[page]
Expand Down Expand Up @@ -39,7 +39,9 @@
(when (seq latest-journals)
[:div#journals
(for [journal latest-journals]
(journal-cp journal))]))
(rum/with-key
(journal-cp journal)
(str "journal-" (:db/id journal))))]))

(rum/defc all-journals < rum/reactive db-mixins/query
[]
Expand Down

0 comments on commit c75efab

Please sign in to comment.