Merge branch 'master' of github.com:marmelab/react-admin

marmelab · Jun 11, 2020 · e314e07 · e314e07
2 parents ca7c95d + a334deb
commit e314e07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/ra-core/src/dataProvider/HttpError.ts b/packages/ra-core/src/dataProvider/HttpError.ts
@@ -5,6 +5,7 @@ class HttpError extends Error {
         public readonly body = null
     ) {
         super(message);
+        Object.setPrototypeOf(this, HttpError.prototype);
         this.name = this.constructor.name;
         if (typeof Error.captureStackTrace === 'function') {
             Error.captureStackTrace(this, this.constructor);

diff --git a/packages/ra-ui-materialui/src/field/ArrayField.tsx b/packages/ra-ui-materialui/src/field/ArrayField.tsx
@@ -134,8 +134,8 @@ export const ArrayField: FunctionComponent<
         fieldKey,
         ...rest
     }) => {
-        const [ids, setIds] = useState();
-        const [data, setData] = useState();
+        const [ids, setIds] = useState(initialState.ids);
+        const [data, setData] = useState(initialState.data);
 
         useEffect(() => {
             const { ids, data } = getDataAndIds(record, source, fieldKey);