@gisce/react-ooui 1.1.28-rc.0 → 1.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.1.28-rc.0",
+  "version": "1.1.29",
   "files": [
     "dist",
     "src",

package/src/__tests__/iconMapper.test.ts

@@ -16,4 +16,15 @@ describe("A IconMapper instance", () => {
     const icon = iconMapper("gtk-find-and-replace");
     expect(icon).toBe(findAndReplaceIcon);
   })
+  test("should return gtk-go", () => {
+    const findAndReplaceIcon = Icons.FileSearchOutlined;
+    const icon = iconMapper("gtk-find-and-replace");
+    expect(icon).toBe(findAndReplaceIcon);
+  })
+  describe("If key doesn't exist in iconMapper", () => {
+    test("should return undefined", () => {
+      const icon = iconMapper("gtk-foo-bar");
+      expect(icon).toBe(undefined);
+    })
+  })
 });

package/src/actionbar/TreeActionBar.tsx

@@ -153,9 +153,24 @@ function TreeActionBar(props: Props) {
               }
             }}
           />
+          {!treeExpandable && (
+            <ButtonWithBadge
+              icon={
+                <FilterOutlined
+                  style={{ color: searchVisible ? "white" : undefined }}
+                />
+              }
+              tooltip={t("advanced_search")}
+              type={searchVisible ? "primary" : "default"}
+              onClick={() => {
+                setSearchVisible?.(!searchVisible);
+              }}
+              disabled={duplicatingItem || removingItem || treeIsLoading}
+              badgeNumber={searchParams?.length}
+            />
+          )}
           {separator()}
           <NewButton disabled={treeIsLoading} />
-          {separator()}
           <ActionButton
             icon={<CopyOutlined />}
             tooltip={t("duplicate")}
@@ -181,22 +196,6 @@ function TreeActionBar(props: Props) {
           {separator()}
         </>
       )}
-      {!treeExpandable && (
-        <ButtonWithBadge
-          icon={
-            <FilterOutlined
-              style={{ color: searchVisible ? "white" : undefined }}
-            />
-          }
-          tooltip={t("advanced_search")}
-          type={searchVisible ? "primary" : "default"}
-          onClick={() => {
-            setSearchVisible?.(!searchVisible);
-          }}
-          disabled={duplicatingItem || removingItem || treeIsLoading}
-          badgeNumber={searchParams?.length}
-        />
-      )}
       <ActionButton
         icon={<InfoCircleOutlined />}
         tooltip={t("showLogs")}

package/src/helpers/iconMapper.ts

@@ -103,8 +103,7 @@ const iconMapping: { [key: string]: string } = {
 export default (key: string) => {
   if (key.indexOf("gtk-") !== -1) {
     const rootIcon = key.replace("gtk-", "").replace(/\-/g, "_");
-    const newKey = `STOCK_${rootIcon.toUpperCase()}`;
-    return getIconForKey(iconMapping[newKey]);
+    key = `STOCK_${rootIcon.toUpperCase()}`;
   }
 
   if (iconMapping.hasOwnProperty(key)) {