@gisce/react-ooui 1.1.27-rc.0 → 1.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.1.27-rc.0",
+  "version": "1.1.27",
   "files": [
     "dist",
     "src",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
-    "@gisce/ooui": "^0.17.13-rc.0",
+    "@gisce/ooui": "^0.17.12",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",
     "@tabler/icons-react": "^2.11.0",

package/src/__tests__/iconMapper.test.ts

@@ -2,14 +2,18 @@ import iconMapper from "../helpers/iconMapper";
 import * as Icons from "@ant-design/icons";
 
 describe("A IconMapper instance", () => {
-  test("should return the default icon when key not found", () => {
-    const defaultIcon = Icons.RightOutlined;
-    const icon = iconMapper("RANDOM_KEY");
-    expect(icon).toBe(defaultIcon);
+  test("should return undefined when key not found", () => {
+    const icon = iconMapper("foo-bar");
+    expect(icon).toBe(undefined);
   });
   test("should return proper help icon when requested", () => {
     const helpIcon = Icons.QuestionOutlined;
-    const icon = iconMapper("STOCK_HELP");
+    const icon = iconMapper("gtk-help");
     expect(icon).toBe(helpIcon);
   });
+  test("should replace all - for _", () => {
+    const findAndReplaceIcon = Icons.FileSearchOutlined;
+    const icon = iconMapper("gtk-find-and-replace");
+    expect(icon).toBe(findAndReplaceIcon);
+  })
 });

package/src/helpers/iconMapper.ts

@@ -102,7 +102,7 @@ const iconMapping: { [key: string]: string } = {
 
 export default (key: string) => {
   if (key.indexOf("gtk-") !== -1) {
-    const rootIcon = key.replace("gtk-", "").replace("-", "_");
+    const rootIcon = key.replace("gtk-", "").replace(/\-/g, "_");
     const newKey = `STOCK_${rootIcon.toUpperCase()}`;
     return getIconForKey(iconMapping[newKey]);
   }
@@ -114,8 +114,8 @@ export default (key: string) => {
   return getIconForKey(key);
 };
 
-function getIconForKey(key: string) {
-  const IconCamelCase = `${key
+function toCamelCase(key: string) : string  {
+  return `${key
     .split("-")
     .map((word) =>
       word.replace(
@@ -124,6 +124,12 @@ function getIconForKey(key: string) {
       )
     )
     .join("")}`;
+}
+
+function getIconForKey(IconCamelCase: string) {
+  if (IconCamelCase.indexOf("-") !== -1) {
+    IconCamelCase = toCamelCase(IconCamelCase);
+  }
 
   const antKey: AntKey = `${IconCamelCase}Outlined` as any;
   if (AntIcons[antKey]) {