Fix regression in memoryStore

Author: djhi

…es/ra-core/src/store/memoryStore.spec.ts …s/ra-core/src/store/memoryStore.spec.tsxpackages/ra-core/src/store/memoryStore.spec.ts renamed to packages/ra-core/src/store/memoryStore.spec.tsx packages/ra-core/src/store/memoryStore.spec.ts renamed to packages/ra-core/src/store/memoryStore.spec.tsx

@@ -1,6 +1,9 @@
+import * as React from 'react';
 import expect from 'expect';
-
+import { render, screen } from '@testing-library/react';
 import { memoryStore } from './memoryStore';
+import { useStore } from './useStore';
+import { StoreContextProvider } from './StoreContextProvider';
 
 describe('memoryStore', () => {
     it('should allow to store and retrieve a value', () => {
@@ -55,16 +58,33 @@ describe('memoryStore', () => {
             const initialStorage = {
                 user: {
                     name: 'John',
-                    settings: {
-                        theme: 'dark',
-                    },
+                },
+                'user.settings': {
+                    theme: 'dark',
                 },
             };
 
             const store = memoryStore(initialStorage);
 
-            expect(store.getItem('user.name')).toEqual('John');
-            expect(store.getItem('user.settings.theme')).toEqual('dark');
+            expect(store.getItem('user')).toEqual({ name: 'John' });
+            expect(store.getItem('user.settings')).toEqual({ theme: 'dark' });
         });
     });
+
+    it('preserves the initial value in StrictMode', async () => {
+        const Component = () => {
+            const [value] = useStore('user', 'Not me');
+            return <>{value}</>;
+        };
+
+        render(
+            <React.StrictMode>
+                <StoreContextProvider value={memoryStore({ user: 'John' })}>
+                    <Component />
+                </StoreContextProvider>
+            </React.StrictMode>
+        );
+
+        await screen.findByText('John');
+    });
 });

packages/ra-core/src/store/memoryStore.tsx

@@ -22,9 +22,7 @@ export const memoryStore = (
     initialStorage: Record<string, any> = {}
 ): Store => {
     // Use a flat Map to store key-value pairs directly without treating dots as nested paths
-    const storage = new Map<string, any>(
-        Object.entries(flatten(initialStorage))
-    );
+    let storage = new Map<string, any>(Object.entries(initialStorage));
     const subscriptions: { [key: string]: Subscription } = {};
 
     const publish = (key: string, value: any) => {
@@ -37,7 +35,9 @@ export const memoryStore = (
     };
 
     return {
-        setup: () => {},
+        setup: () => {
+            storage = new Map<string, any>(Object.entries(initialStorage));
+        },
         teardown: () => {
             storage.clear();
         },
@@ -88,27 +88,3 @@ export const memoryStore = (
         },
     };
 };
-
-// taken from https://stackoverflow.com/a/19101235/1333479
-const flatten = (data: any) => {
-    const result = {};
-    function doFlatten(current, prop) {
-        if (Object(current) !== current) {
-            // scalar value
-            result[prop] = current;
-        } else if (Array.isArray(current)) {
-            // array
-            result[prop] = current;
-        } else {
-            // object
-            let isEmpty = true;
-            for (const p in current) {
-                isEmpty = false;
-                doFlatten(current[p], prop ? prop + '.' + p : p);
-            }
-            if (isEmpty && prop) result[prop] = {};
-        }
-    }
-    doFlatten(data, '');
-    return result;
-};