@contentful/field-editor-rich-text 3.16.6 → 3.16.8

package/dist/cjs/plugins/Hyperlink/components/EntityHyperlink.js

@@ -10,14 +10,12 @@ Object.defineProperty(exports, "EntityHyperlink", {
 });
 const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _f36components = require("@contentful/f36-components");
-const _ContentfulEditorProvider = require("../../../ContentfulEditorProvider");
-const _queries = require("../../../internal/queries");
-const _SdkProvider = require("../../../SdkProvider");
 const _linkstracking = require("../../links-tracking");
 const _useEntityInfo = require("../useEntityInfo");
 const _linkHandlers = require("./linkHandlers");
 const _LinkPopover = require("./LinkPopover");
 const _styles = require("./styles");
+const _useHyperlinkCommon = require("./useHyperlinkCommon");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -60,13 +58,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 function EntityHyperlink(props) {
-    const editor = (0, _ContentfulEditorProvider.useContentfulEditor)();
-    const sdk = (0, _SdkProvider.useSdkContext)();
-    const focus = editor.selection?.focus;
-    const { target } = props.element.data;
+    const { editor, sdk, isLinkFocused, pathToElement } = (0, _useHyperlinkCommon.useHyperlinkCommon)(props.element);
     const { onEntityFetchComplete } = (0, _linkstracking.useLinkTracking)();
-    const pathToElement = (0, _queries.findNodePath)(editor, props.element);
-    const isLinkFocused = pathToElement && focus && (0, _queries.isChildPath)(focus.path, pathToElement);
+    const { target } = props.element.data;
     const tooltipContent = (0, _useEntityInfo.useEntityInfo)({
         target,
         sdk,

package/dist/cjs/plugins/Hyperlink/components/ResourceHyperlink.js

@@ -10,14 +10,12 @@ Object.defineProperty(exports, "ResourceHyperlink", {
 });
 const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _f36components = require("@contentful/f36-components");
-const _ContentfulEditorProvider = require("../../../ContentfulEditorProvider");
-const _queries = require("../../../internal/queries");
-const _SdkProvider = require("../../../SdkProvider");
 const _linkstracking = require("../../links-tracking");
 const _useResourceEntityInfo = require("../useResourceEntityInfo");
 const _linkHandlers = require("./linkHandlers");
 const _LinkPopover = require("./LinkPopover");
 const _styles = require("./styles");
+const _useHyperlinkCommon = require("./useHyperlinkCommon");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -60,13 +58,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 function ResourceHyperlink(props) {
-    const editor = (0, _ContentfulEditorProvider.useContentfulEditor)();
-    const sdk = (0, _SdkProvider.useSdkContext)();
-    const focus = editor.selection?.focus;
-    const { target } = props.element.data;
+    const { editor, sdk, isLinkFocused, pathToElement } = (0, _useHyperlinkCommon.useHyperlinkCommon)(props.element);
     const { onEntityFetchComplete } = (0, _linkstracking.useLinkTracking)();
-    const pathToElement = (0, _queries.findNodePath)(editor, props.element);
-    const isLinkFocused = pathToElement && focus && (0, _queries.isChildPath)(focus.path, pathToElement);
+    const { target } = props.element.data;
     const tooltipContent = (0, _useResourceEntityInfo.useResourceEntityInfo)({
         target,
         onEntityFetchComplete

package/dist/cjs/plugins/Hyperlink/components/UrlHyperlink.js

@@ -10,12 +10,10 @@ Object.defineProperty(exports, "UrlHyperlink", {
 });
 const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _f36components = require("@contentful/f36-components");
-const _ContentfulEditorProvider = require("../../../ContentfulEditorProvider");
-const _queries = require("../../../internal/queries");
-const _SdkProvider = require("../../../SdkProvider");
 const _linkHandlers = require("./linkHandlers");
 const _LinkPopover = require("./LinkPopover");
 const _styles = require("./styles");
+const _useHyperlinkCommon = require("./useHyperlinkCommon");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -58,12 +56,8 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 function UrlHyperlink(props) {
-    const editor = (0, _ContentfulEditorProvider.useContentfulEditor)();
-    const sdk = (0, _SdkProvider.useSdkContext)();
-    const focus = editor.selection?.focus;
+    const { editor, sdk, isLinkFocused, pathToElement } = (0, _useHyperlinkCommon.useHyperlinkCommon)(props.element);
     const uri = props.element.data?.uri;
-    const pathToElement = (0, _queries.findNodePath)(editor, props.element);
-    const isLinkFocused = pathToElement && focus && (0, _queries.isChildPath)(focus.path, pathToElement);
     const popoverText = /*#__PURE__*/ _react.createElement(_f36components.TextLink, {
         className: _styles.styles.openLink,
         href: uri,

package/dist/cjs/plugins/Hyperlink/components/useHyperlinkCommon.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "useHyperlinkCommon", {
+    enumerable: true,
+    get: function() {
+        return useHyperlinkCommon;
+    }
+});
+const _ContentfulEditorProvider = require("../../../ContentfulEditorProvider");
+const _queries = require("../../../internal/queries");
+const _SdkProvider = require("../../../SdkProvider");
+function useHyperlinkCommon(element) {
+    const editor = (0, _ContentfulEditorProvider.useContentfulEditor)();
+    const sdk = (0, _SdkProvider.useSdkContext)();
+    const focus = editor.selection?.focus;
+    const pathToElement = (0, _queries.findNodePath)(editor, element);
+    const isLinkFocused = pathToElement && focus && (0, _queries.isChildPath)(focus.path, pathToElement);
+    return {
+        editor,
+        sdk,
+        isLinkFocused,
+        pathToElement
+    };
+}

package/dist/cjs/plugins/Table/onKeyDownTable.js

@@ -20,9 +20,10 @@ const onKeyDownTable = (editor, plugin)=>{
         // This fixes `Cannot resolve a Slate point from DOM point:
         // [object HTMLDivElement]` when typing while the cursor is before table
         const windowSelection = window.getSelection();
-        if (windowSelection) {
+        // @ts-expect-error
+        // this attribute comes from `plugins/Table/components/Table.tsx`
+        if (windowSelection?.anchorNode?.attributes) {
             // @ts-expect-error
-            // this attribute comes from `plugins/Table/components/Table.tsx`
             const blockType = windowSelection.anchorNode.attributes?.['data-block-type']?.value;
             const isBeforeTable = blockType === _richtexttypes.BLOCKS.TABLE;
             if (isBeforeTable) {

package/dist/esm/plugins/Hyperlink/components/EntityHyperlink.js

@@ -1,21 +1,15 @@
 import * as React from 'react';
 import { Text } from '@contentful/f36-components';
-import { useContentfulEditor } from '../../../ContentfulEditorProvider';
-import { findNodePath, isChildPath } from '../../../internal/queries';
-import { useSdkContext } from '../../../SdkProvider';
 import { useLinkTracking } from '../../links-tracking';
 import { useEntityInfo } from '../useEntityInfo';
 import { handleEditLink, handleRemoveLink } from './linkHandlers';
 import { LinkPopover } from './LinkPopover';
 import { styles } from './styles';
+import { useHyperlinkCommon } from './useHyperlinkCommon';
 export function EntityHyperlink(props) {
-    const editor = useContentfulEditor();
-    const sdk = useSdkContext();
-    const focus = editor.selection?.focus;
-    const { target } = props.element.data;
+    const { editor, sdk, isLinkFocused, pathToElement } = useHyperlinkCommon(props.element);
     const { onEntityFetchComplete } = useLinkTracking();
-    const pathToElement = findNodePath(editor, props.element);
-    const isLinkFocused = pathToElement && focus && isChildPath(focus.path, pathToElement);
+    const { target } = props.element.data;
     const tooltipContent = useEntityInfo({
         target,
         sdk,

package/dist/esm/plugins/Hyperlink/components/ResourceHyperlink.js

@@ -1,21 +1,15 @@
 import * as React from 'react';
 import { Text } from '@contentful/f36-components';
-import { useContentfulEditor } from '../../../ContentfulEditorProvider';
-import { findNodePath, isChildPath } from '../../../internal/queries';
-import { useSdkContext } from '../../../SdkProvider';
 import { useLinkTracking } from '../../links-tracking';
 import { useResourceEntityInfo } from '../useResourceEntityInfo';
 import { handleEditLink, handleRemoveLink } from './linkHandlers';
 import { LinkPopover } from './LinkPopover';
 import { styles } from './styles';
+import { useHyperlinkCommon } from './useHyperlinkCommon';
 export function ResourceHyperlink(props) {
-    const editor = useContentfulEditor();
-    const sdk = useSdkContext();
-    const focus = editor.selection?.focus;
-    const { target } = props.element.data;
+    const { editor, sdk, isLinkFocused, pathToElement } = useHyperlinkCommon(props.element);
     const { onEntityFetchComplete } = useLinkTracking();
-    const pathToElement = findNodePath(editor, props.element);
-    const isLinkFocused = pathToElement && focus && isChildPath(focus.path, pathToElement);
+    const { target } = props.element.data;
     const tooltipContent = useResourceEntityInfo({
         target,
         onEntityFetchComplete

package/dist/esm/plugins/Hyperlink/components/UrlHyperlink.js

@@ -1,18 +1,12 @@
 import * as React from 'react';
 import { TextLink } from '@contentful/f36-components';
-import { useContentfulEditor } from '../../../ContentfulEditorProvider';
-import { findNodePath, isChildPath } from '../../../internal/queries';
-import { useSdkContext } from '../../../SdkProvider';
 import { handleCopyLink, handleEditLink, handleRemoveLink } from './linkHandlers';
 import { LinkPopover } from './LinkPopover';
 import { styles } from './styles';
+import { useHyperlinkCommon } from './useHyperlinkCommon';
 export function UrlHyperlink(props) {
-    const editor = useContentfulEditor();
-    const sdk = useSdkContext();
-    const focus = editor.selection?.focus;
+    const { editor, sdk, isLinkFocused, pathToElement } = useHyperlinkCommon(props.element);
     const uri = props.element.data?.uri;
-    const pathToElement = findNodePath(editor, props.element);
-    const isLinkFocused = pathToElement && focus && isChildPath(focus.path, pathToElement);
     const popoverText = /*#__PURE__*/ React.createElement(TextLink, {
         className: styles.openLink,
         href: uri,

package/dist/esm/plugins/Hyperlink/components/useHyperlinkCommon.js

@@ -0,0 +1,16 @@
+import { useContentfulEditor } from '../../../ContentfulEditorProvider';
+import { findNodePath, isChildPath } from '../../../internal/queries';
+import { useSdkContext } from '../../../SdkProvider';
+export function useHyperlinkCommon(element) {
+    const editor = useContentfulEditor();
+    const sdk = useSdkContext();
+    const focus = editor.selection?.focus;
+    const pathToElement = findNodePath(editor, element);
+    const isLinkFocused = pathToElement && focus && isChildPath(focus.path, pathToElement);
+    return {
+        editor,
+        sdk,
+        isLinkFocused,
+        pathToElement
+    };
+}

package/dist/esm/plugins/Table/onKeyDownTable.js

@@ -10,9 +10,10 @@ export const onKeyDownTable = (editor, plugin)=>{
         // This fixes `Cannot resolve a Slate point from DOM point:
         // [object HTMLDivElement]` when typing while the cursor is before table
         const windowSelection = window.getSelection();
-        if (windowSelection) {
+        // @ts-expect-error
+        // this attribute comes from `plugins/Table/components/Table.tsx`
+        if (windowSelection?.anchorNode?.attributes) {
             // @ts-expect-error
-            // this attribute comes from `plugins/Table/components/Table.tsx`
             const blockType = windowSelection.anchorNode.attributes?.['data-block-type']?.value;
             const isBeforeTable = blockType === BLOCKS.TABLE;
             if (isBeforeTable) {

package/dist/types/plugins/Hyperlink/components/UrlHyperlink.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Link } from '@contentful/app-sdk';
 import { Element, RenderElementProps } from '../../../internal/types';
-type HyperlinkElementProps = {
+type UrlHyperlinkProps = {
     element: Element & {
         data: {
             uri?: string;
@@ -18,5 +18,5 @@ type HyperlinkElementProps = {
     onEntityFetchComplete?: VoidFunction;
     children: Pick<RenderElementProps, 'children'>;
 };
-export declare function UrlHyperlink(props: HyperlinkElementProps): React.JSX.Element;
+export declare function UrlHyperlink(props: UrlHyperlinkProps): React.JSX.Element;
 export {};

package/dist/types/plugins/Hyperlink/components/useHyperlinkCommon.d.ts

@@ -0,0 +1,7 @@
+import { FieldAppSDK } from '@contentful/app-sdk';
+export declare function useHyperlinkCommon(element: any): {
+    editor: import("../../../internal").PlateEditor;
+    sdk: FieldAppSDK;
+    isLinkFocused: boolean | undefined;
+    pathToElement: import("slate").Path | undefined;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-rich-text",
-  "version": "3.16.6",
+  "version": "3.16.8",
   "source": "./src/index.tsx",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -83,5 +83,5 @@
     "prism-react-renderer": "2.0.5",
     "react": ">=16.14.0"
   },
-  "gitHead": "03940a9d0badbb781a4b00daea6930b8d11bdbf6"
+  "gitHead": "d29915303ea8b42cde8c60b8e1df50686d4768ae"
 }