@contentful/field-editor-shared 3.0.1-canary.1 → 3.0.2-canary.12

package/dist/cjs/CharCounter.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "CharCounter", {
 });
 const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _f36tokens = /*#__PURE__*/ _interop_require_default(require("@contentful/f36-tokens"));
-const _emotion = require("emotion");
+const _css = require("@emotion/css");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -58,7 +58,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 const styles = {
-    invalid: (0, _emotion.css)({
+    invalid: (0, _css.css)({
         color: _f36tokens.default.red600
     })
 };
@@ -70,7 +70,7 @@ function CharCounter(props) {
     const valid = count === 0 || props.checkConstraint(count);
     return /*#__PURE__*/ _react.createElement("span", {
         "data-status-code": valid ? null : 'invalid-size',
-        className: (0, _emotion.cx)({
+        className: (0, _css.cx)({
             [styles.invalid]: !valid
         })
     }, count, " characters");

package/dist/cjs/LocalePublishingEntityStatusBadge/LocalePublishingPopover.js

@@ -12,7 +12,7 @@ const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _f36components = require("@contentful/f36-components");
 const _f36icons = require("@contentful/f36-icons");
 const _f36tokens = /*#__PURE__*/ _interop_require_default(require("@contentful/f36-tokens"));
-const _emotion = require("emotion");
+const _css = require("@emotion/css");
 const _entityHelpers = /*#__PURE__*/ _interop_require_wildcard(require("../utils/entityHelpers"));
 const _LocalePublishingStatusList = require("./LocalePublishingStatusList");
 const _ScheduledBanner = require("./ScheduledBanner");
@@ -99,7 +99,7 @@ const getColor = ({ secondary, tertiary, isHover })=>{
     return isHover ? colors[status]?.hover : colors[status]?.default;
 };
 const generateDynamicStyles = (status)=>{
-    const wrapperClass = (0, _emotion.css)({
+    const wrapperClass = (0, _css.css)({
         '& svg[data-status="secondary"]': {
             fill: getColor({
                 secondary: status?.secondary,
@@ -131,13 +131,13 @@ const generateDynamicStyles = (status)=>{
 };
 const getIconColor = (status)=>colors[status].icon;
 const styles = {
-    badge: (0, _emotion.css)({
+    badge: (0, _css.css)({
         '&:focus': {
             outline: 'none',
             boxShadow: `inset ${_f36tokens.default.glowPrimary}`
         }
     }),
-    wrapper: (0, _emotion.css)({
+    wrapper: (0, _css.css)({
         '& svg': {
             transition: 'fill 0.2s ease-in-out'
         },
@@ -145,7 +145,7 @@ const styles = {
             marginLeft: '-1px'
         }
     }),
-    popoverContent: (0, _emotion.css)({
+    popoverContent: (0, _css.css)({
         maxWidth: '336px',
         maxHeight: '368px',
         overflowY: 'auto',
@@ -256,7 +256,7 @@ function LocalePublishingPopover({ entity, jobs, isScheduled, localesStatusMap,
     }, /*#__PURE__*/ _react.default.createElement(_f36components.Popover.Trigger, null, /*#__PURE__*/ _react.default.createElement(_f36components.Flex, {
         "aria-label": ariaLabel,
         alignItems: "center",
-        className: (0, _emotion.cx)(styles.wrapper, wrapperClass)
+        className: (0, _css.cx)(styles.wrapper, wrapperClass)
     }, /*#__PURE__*/ _react.default.createElement(_f36components.EntityStatusBadge, {
         className: styles.badge,
         testId: "entity-state",

package/dist/cjs/ReleaseEntityStatusBadge/ReleaseEntityStatusPopover.js

@@ -12,7 +12,7 @@ const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _f36components = require("@contentful/f36-components");
 const _f36icons = require("@contentful/f36-icons");
 const _f36tokens = /*#__PURE__*/ _interop_require_default(require("@contentful/f36-tokens"));
-const _emotion = require("emotion");
+const _css = require("@emotion/css");
 const _getReleaseStatusBadgeConfig = require("../utils/getReleaseStatusBadgeConfig");
 const _ReleaseEntityStatusLocalesList = require("./ReleaseEntityStatusLocalesList");
 function _interop_require_default(obj) {
@@ -69,7 +69,7 @@ const getColor = ({ secondary, tertiary, isHover })=>{
     return isHover ? (0, _getReleaseStatusBadgeConfig.getReleaseStatusBadgeConfig)(status).hover : (0, _getReleaseStatusBadgeConfig.getReleaseStatusBadgeConfig)(status).default;
 };
 const generateDynamicStyles = (status)=>{
-    const wrapperClass = (0, _emotion.css)({
+    const wrapperClass = (0, _css.css)({
         ...status?.secondary && {
             '& svg[data-status="secondary"]': {
                 fill: getColor({
@@ -102,13 +102,13 @@ const generateDynamicStyles = (status)=>{
     return wrapperClass;
 };
 const styles = {
-    badge: (0, _emotion.css)({
+    badge: (0, _css.css)({
         '&:focus': {
             outline: 'none',
             boxShadow: `inset ${_f36tokens.default.glowPrimary}`
         }
     }),
-    wrapper: (0, _emotion.css)({
+    wrapper: (0, _css.css)({
         '& svg': {
             transition: 'fill 0.2s ease-in-out'
         },
@@ -116,13 +116,13 @@ const styles = {
             marginLeft: '-1px'
         }
     }),
-    popoverContent: (0, _emotion.css)({
+    popoverContent: (0, _css.css)({
         maxWidth: '336px',
         maxHeight: '368px',
         overflowY: 'auto',
         padding: `${_f36tokens.default.spacing2Xs} 0`
     }),
-    skeletonBadge: (0, _emotion.css)({
+    skeletonBadge: (0, _css.css)({
         flexShrink: 0,
         display: 'block',
         height: '20px',
@@ -226,7 +226,7 @@ function ReleaseEntityStatusPopover({ releaseStatusMap, activeLocales }) {
     }, /*#__PURE__*/ _react.default.createElement(_f36components.Popover.Trigger, null, /*#__PURE__*/ _react.default.createElement(_f36components.Flex, {
         "aria-label": ariaLabel,
         alignItems: "center",
-        className: (0, _emotion.cx)(styles.wrapper, wrapperClass)
+        className: (0, _css.cx)(styles.wrapper, wrapperClass)
     }, /*#__PURE__*/ _react.default.createElement(_f36components.Badge, {
         tabIndex: 0,
         variant: variant,

package/dist/cjs/utils/entityHelpers.js

@@ -166,8 +166,14 @@ function getEntryTitle({ entry, contentType, localeCode, defaultLocaleCode, defa
     }
     return titleOrDefault(title, defaultTitle);
 }
+function getLocaleStatusObject(sys) {
+    if ('localeStatus' in sys) {
+        return sys.localeStatus;
+    }
+    return sys.fieldStatus?.['*'];
+}
 function getEntityStatus(sys, localeCodes) {
-    if (!sys || sys.type !== 'Entry' && sys.type !== 'Asset') {
+    if (!sys) {
         throw new TypeError('Invalid entity metadata object');
     }
     if (sys.deletedVersion) {
@@ -176,19 +182,20 @@ function getEntityStatus(sys, localeCodes) {
     if (sys.archivedVersion) {
         return 'archived';
     }
-    if (sys.fieldStatus && localeCodes) {
+    const localeStatus = getLocaleStatusObject(sys);
+    if (localeStatus && localeCodes) {
         let status = 'draft';
         const locales = Array.isArray(localeCodes) ? localeCodes : [
             localeCodes
         ];
-        for (const [localeCode, fieldStatus] of Object.entries(sys.fieldStatus['*'])){
+        for (const [localeCode, localeStatusValue] of Object.entries(localeStatus)){
             if (!locales || locales.includes(localeCode)) {
-                if (fieldStatus === 'changed') {
-                    status = fieldStatus;
+                if (localeStatusValue === 'changed') {
+                    status = localeStatusValue;
                     break;
                 }
-                if (fieldStatus === 'published') {
-                    status = fieldStatus;
+                if (localeStatusValue === 'published') {
+                    status = localeStatusValue;
                 }
             }
         }

package/dist/esm/CharCounter.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import tokens from '@contentful/f36-tokens';
-import { css, cx } from 'emotion';
+import { css, cx } from '@emotion/css';
 const styles = {
     invalid: css({
         color: tokens.red600

package/dist/esm/LocalePublishingEntityStatusBadge/LocalePublishingPopover.js

@@ -2,7 +2,7 @@ import React, { useCallback, useRef, useState } from 'react';
 import { EntityStatusBadge, Flex, Popover } from '@contentful/f36-components';
 import { CaretDownIcon } from '@contentful/f36-icons';
 import tokens from '@contentful/f36-tokens';
-import { cx, css } from 'emotion';
+import { cx, css } from '@emotion/css';
 import * as entityHelpers from '../utils/entityHelpers';
 import { LocalePublishingStatusList } from './LocalePublishingStatusList';
 import { ScheduledBanner } from './ScheduledBanner';

package/dist/esm/ReleaseEntityStatusBadge/ReleaseEntityStatusPopover.js

@@ -2,7 +2,7 @@ import React, { useCallback, useRef, useState } from 'react';
 import { Badge, Flex, Popover } from '@contentful/f36-components';
 import { CaretDownIcon } from '@contentful/f36-icons';
 import tokens from '@contentful/f36-tokens';
-import { css, cx } from 'emotion';
+import { css, cx } from '@emotion/css';
 import { getReleaseStatusBadgeConfig } from '../utils/getReleaseStatusBadgeConfig';
 import { ReleaseEntityStatusLocalesList } from './ReleaseEntityStatusLocalesList';
 const getColor = ({ secondary, tertiary, isHover })=>{

package/dist/esm/utils/entityHelpers.js

@@ -116,8 +116,14 @@ export function getEntryTitle({ entry, contentType, localeCode, defaultLocaleCod
     }
     return titleOrDefault(title, defaultTitle);
 }
+function getLocaleStatusObject(sys) {
+    if ('localeStatus' in sys) {
+        return sys.localeStatus;
+    }
+    return sys.fieldStatus?.['*'];
+}
 export function getEntityStatus(sys, localeCodes) {
-    if (!sys || sys.type !== 'Entry' && sys.type !== 'Asset') {
+    if (!sys) {
         throw new TypeError('Invalid entity metadata object');
     }
     if (sys.deletedVersion) {
@@ -126,19 +132,20 @@ export function getEntityStatus(sys, localeCodes) {
     if (sys.archivedVersion) {
         return 'archived';
     }
-    if (sys.fieldStatus && localeCodes) {
+    const localeStatus = getLocaleStatusObject(sys);
+    if (localeStatus && localeCodes) {
         let status = 'draft';
         const locales = Array.isArray(localeCodes) ? localeCodes : [
             localeCodes
         ];
-        for (const [localeCode, fieldStatus] of Object.entries(sys.fieldStatus['*'])){
+        for (const [localeCode, localeStatusValue] of Object.entries(localeStatus)){
             if (!locales || locales.includes(localeCode)) {
-                if (fieldStatus === 'changed') {
-                    status = fieldStatus;
+                if (localeStatusValue === 'changed') {
+                    status = localeStatusValue;
                     break;
                 }
-                if (fieldStatus === 'published') {
-                    status = fieldStatus;
+                if (localeStatusValue === 'published') {
+                    status = localeStatusValue;
                 }
             }
         }

package/dist/types/LocalePublishingEntityStatusBadge/LocalePublishingPopover.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { LocaleProps, EntryProps, AssetProps, ScheduledActionProps } from 'contentful-management';
 import { LocalePublishStatusMap } from '../hooks/useLocalePublishStatus';
 type LocalePublishingPopoverProps = {
-    entity: EntryProps | AssetProps;
+    entity: Pick<EntryProps | AssetProps, 'sys'>;
     jobs: ScheduledActionProps[];
     isScheduled: boolean;
     activeLocales?: Pick<LocaleProps, 'code'>[];

package/dist/types/hooks/useReleaseStatus.d.ts

@@ -2,10 +2,10 @@ import type { LocalesAPI } from '@contentful/app-sdk';
 import type { AssetProps, EntryProps, LocaleProps, ReleaseProps } from 'contentful-management/types';
 import type { ReleaseEntityStatus, ReleaseStatusMap, ReleaseV2Props } from '../types';
 type UseActiveReleaseLocalesStatuses = {
-    entity?: EntryProps | AssetProps;
+    entity?: Pick<EntryProps | AssetProps, 'sys'>;
     locales: LocaleProps[] | LocalesAPI;
     release?: ReleaseProps | ReleaseV2Props;
-    previousEntityOnTimeline?: EntryProps | AssetProps;
+    previousEntityOnTimeline?: Pick<EntryProps | AssetProps, 'sys'>;
     isReference?: boolean;
 };
 type UseRelaseStatus = {

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

@@ -56,8 +56,8 @@ export declare function getEntryTitle({ entry, contentType, localeCode, defaultL
     defaultLocaleCode: string;
     defaultTitle: string;
 }): string;
-type FieldStatus = 'draft' | 'published' | 'changed';
 export type EntitySys = Entry['sys'] | Asset['sys'];
+type FieldStatus = 'draft' | 'published' | 'changed';
 /**
  * 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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-shared",
-  "version": "3.0.1-canary.1+82cb101d",
+  "version": "3.0.2-canary.12+a033ba5a",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@contentful/app-sdk": "^4.42.0",
-    "@contentful/field-editor-test-utils": "^1.8.1-canary.49+82cb101d",
+    "@contentful/field-editor-test-utils": "^2.0.0",
     "@lingui/core": "5.3.0",
     "@tanstack/react-query": "^4.3.9",
     "@testing-library/react": "16.3.0"
@@ -51,7 +51,7 @@
   "dependencies": {
     "@contentful/f36-components": "^6.7.1",
     "@contentful/f36-icons": "^6.7.1",
-    "@contentful/f36-note": "^5.1.0",
+    "@contentful/f36-note": "^6.7.1",
     "@contentful/f36-tokens": "^6.1.2",
     "@emotion/css": "^11.13.5",
     "contentful-management": "^11.60.4",
@@ -73,5 +73,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "82cb101d676beeda9178245deec48f983d664f88"
+  "gitHead": "a033ba5aa402ff68a0ee2da3dc1ca39c46795eed"
 }