@contentful/field-editor-shared 1.5.2 → 1.5.4

package/dist/cjs/FieldConnector.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "FieldConnector", {
     }
 });
 const _react = _interop_require_wildcard(require("react"));
+const _fastdeepequal = _interop_require_default(require("fast-deep-equal"));
 const _debounce = _interop_require_default(require("lodash/debounce"));
-const _isEqual = _interop_require_default(require("lodash/isEqual"));
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -167,7 +167,7 @@ _define_property(FieldConnector, "defaultProps", {
         return value === null || value === '';
     },
     isEqualValues: (value1, value2)=>{
-        return (0, _isEqual.default)(value1, value2);
+        return (0, _fastdeepequal.default)(value1, value2);
     },
     debounce: 300
 });

package/dist/cjs/utils/entityHelpers.js

@@ -15,6 +15,9 @@ _export(exports, {
     getEntityDescription: function() {
         return getEntityDescription;
     },
+    getEntityStatus: function() {
+        return getEntityStatus;
+    },
     getEntryImage: function() {
         return getEntryImage;
     },
@@ -160,7 +163,7 @@ function getEntryTitle({ entry, contentType, localeCode, defaultLocaleCode, defa
     }
     return titleOrDefault(title, defaultTitle);
 }
-function getEntryStatus(sys, localeCodes) {
+function getEntityStatus(sys, localeCodes) {
     if (!sys || sys.type !== 'Entry' && sys.type !== 'Asset') {
         throw new TypeError('Invalid entity metadata object');
     }
@@ -170,6 +173,27 @@ function getEntryStatus(sys, localeCodes) {
     if (sys.archivedVersion) {
         return 'archived';
     }
+    if (sys.fieldStatus && localeCodes) {
+        let status = 'draft';
+        const isMatchingLocale = (locale)=>{
+            if (Array.isArray(localeCodes)) {
+                return localeCodes.includes(locale);
+            }
+            return localeCodes ? localeCodes === locale : true;
+        };
+        Object.entries(sys.fieldStatus['*']).forEach(([localeCode, fieldStatus])=>{
+            if (isMatchingLocale(localeCode)) {
+                if (fieldStatus === 'changed') {
+                    status = fieldStatus;
+                    return;
+                }
+                if (fieldStatus === 'published') {
+                    status = fieldStatus;
+                }
+            }
+        });
+        return status;
+    }
     if (sys.publishedVersion) {
         if (sys.version > sys.publishedVersion + 1) {
             return 'changed';
@@ -179,6 +203,9 @@ function getEntryStatus(sys, localeCodes) {
     }
     return 'draft';
 }
+function getEntryStatus(sys, localeCodes) {
+    return getEntityStatus(sys, localeCodes);
+}
 const getEntryImage = async ({ entry, contentType, localeCode }, getAsset)=>{
     if (!contentType) {
         return null;

package/dist/esm/FieldConnector.js

@@ -12,8 +12,8 @@ function _define_property(obj, key, value) {
     return obj;
 }
 import * as React from 'react';
+import deepEqual from 'fast-deep-equal';
 import debounce from 'lodash/debounce';
-import isEqual from 'lodash/isEqual';
 var _React_Component;
 export class FieldConnector extends (_React_Component = React.Component) {
     componentDidMount() {
@@ -111,7 +111,7 @@ _define_property(FieldConnector, "defaultProps", {
         return value === null || value === '';
     },
     isEqualValues: (value1, value2)=>{
-        return isEqual(value1, value2);
+        return deepEqual(value1, value2);
     },
     debounce: 300
 });

package/dist/esm/utils/entityHelpers.js

@@ -116,7 +116,7 @@ export function getEntryTitle({ entry, contentType, localeCode, defaultLocaleCod
     }
     return titleOrDefault(title, defaultTitle);
 }
-export function getEntryStatus(sys, localeCodes) {
+export function getEntityStatus(sys, localeCodes) {
     if (!sys || sys.type !== 'Entry' && sys.type !== 'Asset') {
         throw new TypeError('Invalid entity metadata object');
     }
@@ -126,6 +126,27 @@ export function getEntryStatus(sys, localeCodes) {
     if (sys.archivedVersion) {
         return 'archived';
     }
+    if (sys.fieldStatus && localeCodes) {
+        let status = 'draft';
+        const isMatchingLocale = (locale)=>{
+            if (Array.isArray(localeCodes)) {
+                return localeCodes.includes(locale);
+            }
+            return localeCodes ? localeCodes === locale : true;
+        };
+        Object.entries(sys.fieldStatus['*']).forEach(([localeCode, fieldStatus])=>{
+            if (isMatchingLocale(localeCode)) {
+                if (fieldStatus === 'changed') {
+                    status = fieldStatus;
+                    return;
+                }
+                if (fieldStatus === 'published') {
+                    status = fieldStatus;
+                }
+            }
+        });
+        return status;
+    }
     if (sys.publishedVersion) {
         if (sys.version > sys.publishedVersion + 1) {
             return 'changed';
@@ -135,6 +156,9 @@ export function getEntryStatus(sys, localeCodes) {
     }
     return 'draft';
 }
+export function getEntryStatus(sys, localeCodes) {
+    return getEntityStatus(sys, localeCodes);
+}
 export const getEntryImage = async ({ entry, contentType, localeCode }, getAsset)=>{
     if (!contentType) {
         return null;

package/dist/types/FieldConnector.d.ts

@@ -25,7 +25,7 @@ type FieldConnectorProps<ValueType> = {
     isDisabled?: boolean;
     children: (state: FieldConnectorChildProps<ValueType>) => React.ReactNode;
     isEmptyValue: (value: ValueType | null) => boolean;
-    isEqualValues: (value1: ValueType | Nullable, value2: ValueType | Nullable) => boolean;
+    isEqualValues?: (value1: ValueType | Nullable, value2: ValueType | Nullable) => boolean;
 } & ({
     debounce: number;
 } | {

package/dist/types/utils/entityHelpers.d.ts

@@ -59,6 +59,19 @@ type AsyncPublishStatus = 'draft' | 'published' | 'changed';
 type FieldStatus = {
     '*': Record<string, AsyncPublishStatus>;
 };
+/**
+ * Returns the status of the entry/asset
+ * If a locale code(s) is provided it will pick up the most advanced state for these locale(s)
+ * - deleted
+ * - archived
+ * - changed
+ * - published
+ * - draft
+ */
+export declare function getEntityStatus(sys: (Entry['sys'] | Asset['sys']) & {
+    fieldStatus?: FieldStatus;
+}, localeCodes?: string | string[]): "draft" | "published" | "changed" | "deleted" | "archived";
+/**@deprecated use `getEntityStatus` */
 export declare function getEntryStatus(sys: Entry['sys'] & {
     fieldStatus?: FieldStatus;
 }, localeCodes?: string | string[]): "draft" | "published" | "changed" | "deleted" | "archived";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-shared",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -42,6 +42,7 @@
     "@contentful/f36-note": "^4.2.8",
     "@contentful/f36-tokens": "^4.0.0",
     "emotion": "^10.0.17",
+    "fast-deep-equal": "^3.1.3",
     "lodash": "^4.17.15"
   },
   "peerDependencies": {
@@ -51,5 +52,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "4ec14a5b5611b2bfa17bfa10b4ac5942c2c25406"
+  "gitHead": "f9d4036890841b8d459dd92912f2d410a8ee72f6"
 }