Merge branch 'develop'

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muffin-admin",
-  "version": "3.12.2",
+  "version": "3.12.3",
   "description": "NPM package for https://github.com/klen/muffin-admin",
   "files": [
     "src",

frontend/src/MuffinAdmin.tsx

@@ -17,7 +17,7 @@ import {
 import { ConfirmationProvider } from "./common"
 import { useMuffinAdminOpts } from "./hooks"
 import { buildProvider, muffinTranslations } from "./i18n"
-import { buildAdmin, findBuilder, findIcon, setupAdmin } from "./utils"
+import { buildAdmin, deepMerge, findBuilder, findIcon, setupAdmin } from "./utils"
 
 export function MuffinAdmin(props: AdminProps) {
   const opts = useMuffinAdminOpts()
@@ -29,7 +29,7 @@ export function MuffinAdmin(props: AdminProps) {
       ? Object.fromEntries(
           Object.entries(muffinTranslations).map(([locale, messages]) => [
             locale,
-            { ...messages, ...backendLocales[locale], ...(buildAdmin(["locale", locale]) || {}) },
+            deepMerge({}, messages, backendLocales[locale], buildAdmin(["locale", locale]) || {}),
           ])
         )
       : muffinTranslations

frontend/src/utils.tsx

@@ -64,3 +64,24 @@ export function buildIcon(icon?: string) {
   const Icon = findIcon(icon)
   if (Icon) return <Icon />
 }
+
+function isObject(item: any) {
+  return item && typeof item === "object" && !Array.isArray(item)
+}
+
+export function deepMerge(target: any, ...sources: any[]): any {
+  if (!sources.length) return target
+  const source = sources.shift()
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} })
+        deepMerge(target[key], source[key])
+      } else {
+        Object.assign(target, { [key]: source[key] })
+      }
+    }
+  }
+  return deepMerge(target, ...sources)
+}

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "muffin-admin"
-version = "3.12.2"
+version = "3.12.3"
 description = "Admin interface for Muffin Framework"
 readme = "README.rst"
 license = "MIT"