@vertigis/react-ui 11.27.0 → 11.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vertigis/react-ui",
-    "version": "11.27.0",
+    "version": "11.28.0",
     "description": "Utilities and React components used in VertiGIS applications.",
     "keywords": [
         "vertigis",
@@ -26,7 +26,6 @@
         "clsx": "^1.2.1",
         "color": "^4.2.3",
         "lodash.escape": "^4.0.1",
-        "lodash.merge": "^4.6.2",
         "marked": "^4.2.12",
         "react-color": "^2.19.3",
         "tslib": "^2.1.0",
@@ -37,7 +36,6 @@
         "@types/autosuggest-highlight": "^3.2.0",
         "@types/color": "^3.0.1",
         "@types/lodash.escape": "^4.0.1",
-        "@types/lodash.merge": "^4.6.7",
         "@types/marked": "^4.0.2",
         "@types/react-color": "^3.0.6",
         "@vertigis/icons": "5.0.581"

package/styles/createTheme.d.ts

@@ -12,3 +12,12 @@ export interface CreateThemeOptions extends ThemeOptions {
 declare function createTheme(options?: CreateThemeOptions): Theme;
 export default createTheme;
 export type { Direction } from "@mui/material/styles";
+/**
+ * Merges theme overrides with a base theme.
+ *
+ * @param theme The theme to override.
+ * @param overrides New theme settings that will be deeply merged with the
+ *   original theme.
+ * @returns A new theme that is the merger of the original theme plus overrides.
+ */
+export declare function overrideTheme(theme: Theme, overrides: Partial<Theme>): Theme;

package/styles/createTheme.js

@@ -1,5 +1,4 @@
 import { alpha, createTheme as createMuiTheme } from "@mui/material/styles";
-import merge from "lodash.merge";
 import blue from "../colors/blue.js";
 import common from "../colors/common.js";
 import green from "../colors/green.js";
@@ -938,9 +937,50 @@ function createTheme(options = {}) {
     // If we are using light mode, then we want to use our defined light theme palette
     const modeOptions = mode === "light" ? lightThemeOverrides : {};
     const { dense = false, ...overrides } = options;
-    /* eslint-disable @typescript-eslint/no-unsafe-call */
-    const mergedOptions = merge({}, defaultOptions, modeOptions, dense ? defaultDenseOptions : {}, overrides);
+    const mergedOptions = deepAssign({}, defaultOptions, modeOptions, dense ? defaultDenseOptions : {}, overrides);
     const createdTheme = createMuiTheme(mergedOptions);
-    return merge({}, getOverrides(createdTheme), createdTheme);
+    return overrideTheme(createdTheme, getOverrides(createdTheme));
 }
 export default createTheme;
+/**
+ * Merges theme overrides with a base theme.
+ *
+ * @param theme The theme to override.
+ * @param overrides New theme settings that will be deeply merged with the
+ *   original theme.
+ * @returns A new theme that is the merger of the original theme plus overrides.
+ */
+export function overrideTheme(theme, overrides) {
+    return deepAssign({}, theme, overrides);
+}
+/**
+ * A recursive version of Object.assign().
+ */
+function deepAssign(target, ...sources) {
+    if (target === null || target === undefined) {
+        throw new TypeError("Cannot convert undefined or null to object.");
+    }
+    const result = Object(target);
+    sources.forEach(source => {
+        if (!source) {
+            return;
+        }
+        const sourceObj = Object(source);
+        for (const key of Object.keys(sourceObj)) {
+            const sourceValue = sourceObj[key];
+            if (result[key] && typeof result[key] === "object") {
+                deepAssign(result[key], sourceValue);
+            }
+            else if (Array.isArray(sourceValue)) {
+                result[key] = deepAssign([], sourceValue);
+            }
+            else if (sourceValue && typeof sourceValue === "object") {
+                result[key] = deepAssign({}, sourceValue);
+            }
+            else {
+                result[key] = sourceValue;
+            }
+        }
+    });
+    return result;
+}