浏览代码

enhance(ui): add class options for icon ui component

charlie 2 年之前
父节点
当前提交
295c8c55c1
共有 1 个文件被更改,包括 7 次插入7 次删除
  1. 7 7
      src/main/frontend/ui.cljs

+ 7 - 7
src/main/frontend/ui.cljs

@@ -246,7 +246,7 @@
            [:div.flex-shrink-0
            [:div.flex-shrink-0
             svg]
             svg]
            [:div.ml-3.w-0.flex-1
            [:div.ml-3.w-0.flex-1
-            [:div.text-sm.leading-5.font-medium.whitespace-pre-line {:style {:margin 0}}
+            [:div.text-sm.leading-6.font-medium.whitespace-pre-line {:style {:margin 0}}
              content]]
              content]]
            [:div.ml-4.flex-shrink-0.flex
            [:div.ml-4.flex-shrink-0.flex
             [:button.inline-flex.text-gray-400.focus:outline-none.focus:text-gray-500.transition.ease-in-out.duration-150.notification-close-button
             [:button.inline-flex.text-gray-400.focus:outline-none.focus:text-gray-500.transition.ease-in-out.duration-150.notification-close-button
@@ -942,24 +942,24 @@
   (memoize (fn [klass] (r/adapt-class klass))))
   (memoize (fn [klass] (r/adapt-class klass))))
 
 
 (defn icon
 (defn icon
-  ([class] (icon class nil))
-  ([class {:keys [extension? font?] :as opts}]
-   (when-not (string/blank? class)
+  ([name] (icon name nil))
+  ([name {:keys [extension? font? class] :as opts}]
+   (when-not (string/blank? name)
      (let [^js jsTablerIcons (gobj/get js/window "tablerIcons")]
      (let [^js jsTablerIcons (gobj/get js/window "tablerIcons")]
        (if (or extension? font? (not jsTablerIcons))
        (if (or extension? font? (not jsTablerIcons))
          [:span.ui__icon (merge {:class
          [:span.ui__icon (merge {:class
                                  (util/format
                                  (util/format
-                                  (str "%s-" class
+                                  (str "%s-" name
                                        (when (:class opts)
                                        (when (:class opts)
                                          (str " " (string/trim (:class opts)))))
                                          (str " " (string/trim (:class opts)))))
                                   (if extension? "tie tie" "ti ti"))}
                                   (if extension? "tie tie" "ti ti"))}
                                 (dissoc opts :class :extension? :font?))]
                                 (dissoc opts :class :extension? :font?))]
 
 
          ;; tabler svg react
          ;; tabler svg react
-         (when-let [klass (gobj/get js/tablerIcons (str "Icon" (csk/->PascalCase class)))]
+         (when-let [klass (gobj/get js/tablerIcons (str "Icon" (csk/->PascalCase name)))]
            (let [f (get-adapt-icon-class klass)]
            (let [f (get-adapt-icon-class klass)]
              [:span.ui__icon.ti
              [:span.ui__icon.ti
-              {:class (str "ls-icon-" class)}
+              {:class (str "ls-icon-" name " " class)}
               (f (merge {:size 18} (r/map-keys->camel-case (dissoc opts :class))))])))))))
               (f (merge {:size 18} (r/map-keys->camel-case (dissoc opts :class))))])))))))
 
 
 (defn button
 (defn button