prezly · kamilmielnik · Jun 7, 2021 · Jun 7, 2021 · Jun 7, 2021 · Jun 7, 2021
diff --git a/packages/slate-editor/package-lock.json b/packages/slate-editor/package-lock.json
diff --git a/packages/slate-editor/package.json b/packages/slate-editor/package.json
@@ -24,6 +24,7 @@
         "@prezly/events": "*",
         "@prezly/linear-partition": "*",
         "@prezly/progress-promise": "*",
+        "@prezly/sdk": "*",
         "@prezly/slate-commons": "*",
         "@prezly/slate-hyperscript": "*",
         "@prezly/slate-lists": "*",
@@ -55,6 +56,7 @@
         "@prezly/events": "^1.0.2",
         "@prezly/linear-partition": "^1.0.0",
         "@prezly/progress-promise": "^1.0.0",
+        "@prezly/sdk": "^2.9.2",
         "@prezly/slate-commons": "^0.1.4",
         "@prezly/slate-hyperscript": "^0.1.4",
         "@prezly/slate-lists": "^0.1.4",

diff --git a/...src/modules/editor-v4-coverage/components/CoverageElement/CoverageBlock/CoverageBlock.tsx b/...src/modules/editor-v4-coverage/components/CoverageElement/CoverageBlock/CoverageBlock.tsx
@@ -1,9 +1,9 @@
+import { Coverage } from '@prezly/sdk';
 import classNames from 'classnames';
 import moment from 'moment';
 import React, { FunctionComponent } from 'react';
 
 import { MultilineEllipsis } from '../../../../../components';
-import { Coverage } from '../../../../../types';
 
 import {
     getCoverageDescription,

diff --git a/...late-editor/src/modules/editor-v4-coverage/components/CoverageElement/CoverageElement.tsx b/...late-editor/src/modules/editor-v4-coverage/components/CoverageElement/CoverageElement.tsx
@@ -1,3 +1,4 @@
+import { Coverage } from '@prezly/sdk';
 import classNames from 'classnames';
 import React, { FunctionComponent, useEffect } from 'react';
 import { useAsyncFn } from 'react-use';
@@ -6,7 +7,6 @@ import { RenderElementProps, useSelected } from 'slate-react';
 import { LoadingPlaceholderV2 } from '../../../../components';
 import { Coverage as CoverageIcon } from '../../../../icons';
 import { ApiError } from '../../../../modules/api';
-import { Coverage } from '../../../../types';
 
 import { CoverageElementType } from '../../types';
 

diff --git a/...r/src/modules/editor-v4-coverage/components/FloatingCoverageMenu/FloatingCoverageMenu.tsx b/...r/src/modules/editor-v4-coverage/components/FloatingCoverageMenu/FloatingCoverageMenu.tsx
@@ -1,9 +1,9 @@
+import { Coverage } from '@prezly/sdk';
 import React, { FunctionComponent, ReactNode, RefObject, useRef } from 'react';
 import { useSlate } from 'slate-react';
 
 import { FloatingContainer } from '../../../../modules/editor-v4-components';
 import { EventsEditor } from '../../../../modules/editor-v4-events';
-import { Coverage } from '../../../../types';
 
 import { SearchProps } from '../../types';
 

diff --git a/packages/slate-editor/src/modules/editor-v4-coverage/jsx.ts b/packages/slate-editor/src/modules/editor-v4-coverage/jsx.ts
@@ -1,11 +1,10 @@
 /* eslint-disable @typescript-eslint/no-namespace */
 
+import { Coverage } from '@prezly/sdk';
 import { PARAGRAPH_TYPE } from '@prezly/slate-commons';
 import { createHyperscript } from '@prezly/slate-hyperscript';
 import { ReactNode } from 'react';
 
-import { Coverage } from '../../types';
-
 import { COVERAGE_TYPE } from './constants';
 
 declare global {

diff --git a/packages/slate-editor/src/modules/editor-v4-coverage/lib/createCoverage.ts b/packages/slate-editor/src/modules/editor-v4-coverage/lib/createCoverage.ts
@@ -1,7 +1,6 @@
+import { Coverage } from '@prezly/sdk';
 import { v4 as uuidV4 } from 'uuid';
 
-import { Coverage } from '../../../types';
-
 import { COVERAGE_TYPE } from '../constants';
 import { CoverageElementType } from '../types';
 

diff --git a/packages/slate-editor/src/modules/editor-v4-coverage/lib/getCoverageDescription.ts b/packages/slate-editor/src/modules/editor-v4-coverage/lib/getCoverageDescription.ts
@@ -1,5 +1,6 @@
+import { Coverage } from '@prezly/sdk';
+
 import { formatBytes } from '../../../lib';
-import { Coverage } from '../../../types';
 
 const getCoverageDescription = (coverage: Coverage): string => {
     if (coverage.attachment_oembed && coverage.attachment_oembed.description) {

diff --git a/packages/slate-editor/src/modules/editor-v4-coverage/lib/getCoverageImageUrl.ts b/packages/slate-editor/src/modules/editor-v4-coverage/lib/getCoverageImageUrl.ts
@@ -1,7 +1,6 @@
+import { Coverage } from '@prezly/sdk';
 import { UploadcareImage } from '@prezly/uploadcare';
 
-import { Coverage } from '../../../types';
-
 const getCoverageImageUrl = (coverage: Coverage, imageHeight: number): string | null => {
     if (coverage.attachment_oembed && coverage.attachment_oembed.thumbnail_url) {
         return coverage.attachment_oembed.thumbnail_url;

diff --git a/packages/slate-editor/src/modules/editor-v4-coverage/lib/getCoverageTitle.ts b/packages/slate-editor/src/modules/editor-v4-coverage/lib/getCoverageTitle.ts
@@ -1,4 +1,4 @@
-import { Coverage } from '../../../types';
+import { Coverage } from '@prezly/sdk';
 
 const getCoverageTitle = (coverage: Coverage): string => {
     if (coverage.attachment_oembed && coverage.attachment_oembed.title) {

diff --git a/packages/slate-editor/src/modules/editor-v4-coverage/lib/hasOnlyFileAttachment.ts b/packages/slate-editor/src/modules/editor-v4-coverage/lib/hasOnlyFileAttachment.ts
@@ -1,4 +1,4 @@
-import { Coverage } from '../../../types';
+import { Coverage } from '@prezly/sdk';
 
 const hasOnlyFileAttachment = (coverage: Coverage): boolean => {
     if (coverage.attachment_oembed && coverage.attachment_oembed.description) {

diff --git a/packages/slate-editor/src/modules/editor-v4-coverage/lib/insertCoverage.ts b/packages/slate-editor/src/modules/editor-v4-coverage/lib/insertCoverage.ts
@@ -1,8 +1,7 @@
+import { Coverage } from '@prezly/sdk';
 import { EditorCommands } from '@prezly/slate-commons';
 import { Editor } from 'slate';
 
-import { Coverage } from '../../../types';
-
 import createCoverage from './createCoverage';
 
 const insertCoverage = (editor: Editor, coverageId: Coverage['id']): void => {

diff --git a/packages/slate-editor/src/modules/editor-v4-coverage/lib/useFloatingCoverageMenu.ts b/packages/slate-editor/src/modules/editor-v4-coverage/lib/useFloatingCoverageMenu.ts
@@ -1,9 +1,9 @@
+import { Coverage } from '@prezly/sdk';
 import { useSavedSelection } from '@prezly/slate-commons';
 import { useState } from 'react';
 import { ReactEditor } from 'slate-react';
 
 import { EventsEditor } from '../../../modules/editor-v4-events';
-import { Coverage } from '../../../types';
 
 import insertCoverage from './insertCoverage';
 

diff --git a/packages/slate-editor/src/modules/editor-v4-coverage/types.ts b/packages/slate-editor/src/modules/editor-v4-coverage/types.ts
@@ -1,8 +1,7 @@
+import { Coverage } from '@prezly/sdk';
 import { ReactNode, RefObject } from 'react';
 import { Element } from 'slate';
 
-import { Coverage } from '../../types';
-
 import { COVERAGE_TYPE } from './constants';
 
 export type CoverageType = typeof COVERAGE_TYPE;

diff --git a/packages/slate-editor/src/modules/editor-v4-embed/components/EmbedElement/EmbedElement.tsx b/packages/slate-editor/src/modules/editor-v4-embed/components/EmbedElement/EmbedElement.tsx
@@ -30,7 +30,7 @@ const EmbedElement: FunctionComponent<Props> = ({
     useEffect(() => {
         if (!isUsingScreenshots && contentRef.current) {
             injectOembedMarkup({
-                oembed: element.oembed,
+                html: element.oembed.html,
                 onError: () => setIsInvalid(true),
                 target: contentRef.current,
             });

diff --git a/packages/slate-editor/src/modules/editor-v4-embed/lib/createEmbed.ts b/packages/slate-editor/src/modules/editor-v4-embed/lib/createEmbed.ts
@@ -1,7 +1,6 @@
+import { OEmbedInfo } from '@prezly/sdk';
 import { v4 as uuidV4 } from 'uuid';
 
-import { OEmbedInfo } from '../../../types';
-
 import { EMBED_TYPE } from '../constants';
 import { EmbedElementType } from '../types';
 

diff --git a/packages/slate-editor/src/modules/editor-v4-embed/lib/injectOembedMarkup.ts b/packages/slate-editor/src/modules/editor-v4-embed/lib/injectOembedMarkup.ts
@@ -1,7 +1,5 @@
-import { OEmbedInfo } from '../../../types';
-
 interface Parameters {
-    oembed: OEmbedInfo;
+    html: string | undefined;
     onError: () => void;
     target: HTMLElement;
 }
@@ -14,9 +12,9 @@ function copyScriptAttributes(source: HTMLScriptElement, target: HTMLScriptEleme
     target.innerText = source.innerText;
 }
 
-export default function injectOembedMarkup({ oembed, onError, target }: Parameters): void {
+export default function injectOembedMarkup({ html, onError, target }: Parameters): void {
     const container = document.createElement('div');
-    container.innerHTML = oembed.html || '';
+    container.innerHTML = html || '';
     const embedScripts = Array.from(container.getElementsByTagName('script'));
 
     embedScripts.forEach((embedScript) => {

diff --git a/packages/slate-editor/src/modules/editor-v4-embed/lib/isOEmbedInfo.ts b/packages/slate-editor/src/modules/editor-v4-embed/lib/isOEmbedInfo.ts
@@ -1,12 +1,12 @@
-import { OEmbedInfo, OEmbedInfoType } from '../../../types';
+import { OEmbedInfo } from '@prezly/sdk';
 
-const isOEmbedInfo = (oembed: any): oembed is OEmbedInfo =>
-    typeof oembed === 'object' &&
-    oembed !== null &&
-    Object.values(OEmbedInfoType).includes(oembed.type) &&
-    typeof oembed.url === 'string' &&
-    oembed.url.length > 0 &&
-    typeof oembed.version === 'string' &&
-    oembed.version.length > 0;
+const isOEmbedInfo = (value: any): value is OEmbedInfo =>
+    typeof value === 'object' &&
+    value !== null &&
+    ['video', 'photo', 'rich', 'link'].includes(value.type) &&
+    typeof value.url === 'string' &&
+    value.url.length > 0 &&
+    typeof value.version === 'string' &&
+    value.version.length > 0;
 
 export default isOEmbedInfo;
diff --git a/packages/slate-editor/src/modules/editor-v4-embed/lib/normalizeRedundantEmbedAttributes.ts b/packages/slate-editor/src/modules/editor-v4-embed/lib/normalizeRedundantEmbedAttributes.ts
@@ -1,14 +1,10 @@
 import { EditorCommands } from '@prezly/slate-commons';
 import { Editor, NodeEntry } from 'slate';
 
-import { OEmbedInfoType } from '../../../types';
-
 import createEmbed from './createEmbed';
 import isEmbedElement from './isEmbedElement';
 
-const ALLOWED_ATTRIBUTES = Object.keys(
-    createEmbed({ type: OEmbedInfoType.LINK, url: '', version: '1.0' }, ''),
-);
+const ALLOWED_ATTRIBUTES = Object.keys(createEmbed({ type: 'link', url: '', version: '1.0' }, ''));
 
 const normalizeRedundantEmbedAttributes = (editor: Editor, [node, path]: NodeEntry): boolean => {
     if (!isEmbedElement(node)) {

diff --git a/packages/slate-editor/src/modules/editor-v4-embed/lib/useFloatingEmbedInput.ts b/packages/slate-editor/src/modules/editor-v4-embed/lib/useFloatingEmbedInput.ts
@@ -1,3 +1,4 @@
+import { OEmbedInfo } from '@prezly/sdk';
 import { EditorCommands, useSavedSelection } from '@prezly/slate-commons';
 import { useState } from 'react';
 import { ReactEditor } from 'slate-react';
@@ -11,7 +12,6 @@ import {
     removeLoader,
     replaceLoader,
 } from '../../../modules/editor-v4-loader';
-import { OEmbedInfo } from '../../../types';
 
 import createEmbed from './createEmbed';
 

diff --git a/packages/slate-editor/src/modules/editor-v4-embed/types.ts b/packages/slate-editor/src/modules/editor-v4-embed/types.ts
@@ -1,8 +1,7 @@
+import { OEmbedInfo } from '@prezly/sdk';
 import { RefObject } from 'react';
 import { Element } from 'slate';
 
-import { OEmbedInfo } from '../../types';
-
 import { EMBED_TYPE } from './constants';
 
 export type EmbedType = typeof EMBED_TYPE;

diff --git a/packages/slate-editor/src/modules/editor-v4-events/types.ts b/packages/slate-editor/src/modules/editor-v4-events/types.ts
@@ -1,8 +1,8 @@
 import { Listener } from '@prezly/events';
+import { Coverage } from '@prezly/sdk';
+import { PressContact } from '@prezly/slate-types';
 import { ReactNode } from 'react';
 
-import { Coverage, PressContact } from '../../types';
-
 export type EditorEventMap = {
     'attachment-add-clicked': never;
     'attachment-added': {

diff --git a/packages/slate-editor/src/modules/editor-v4-galleries/types.ts b/packages/slate-editor/src/modules/editor-v4-galleries/types.ts
@@ -1,9 +1,8 @@
+import { NewsroomRef } from '@prezly/sdk';
 import { UploadcareImageStoragePayload } from '@prezly/uploadcare';
 import { RefObject } from 'react';
 import { Editor, Element } from 'slate';
 
-import { NewsroomRef } from '../../types';
-
 import { GALLERY_TYPE } from './constants';
 
 export type GalleryType = typeof GALLERY_TYPE;

diff --git a/packages/slate-editor/src/modules/editor-v4-image/types.ts b/packages/slate-editor/src/modules/editor-v4-image/types.ts
@@ -1,9 +1,8 @@
+import { NewsroomRef } from '@prezly/sdk';
 import { UploadcareImageStoragePayload } from '@prezly/uploadcare';
 import { RefObject } from 'react';
 import { Editor, Element, Text } from 'slate';
 
-import { NewsroomRef } from '../../types';
-
 import { IMAGE_CANDIDATE_TYPE, IMAGE_TYPE } from './constants';
 
 export type ImageType = typeof IMAGE_TYPE;

diff --git a/packages/slate-editor/src/modules/editor-v4-uploadcare/types.ts b/packages/slate-editor/src/modules/editor-v4-uploadcare/types.ts
@@ -1,9 +1,8 @@
+import { NewsroomRef } from '@prezly/sdk';
 import { UPLOADCARE_FILE_DATA_KEY } from '@prezly/uploadcare';
 import { Editor } from 'slate';
 import { FilePromise } from 'uploadcare-widget';
 
-import { NewsroomRef } from '../../types';
-
 interface File {
     [UPLOADCARE_FILE_DATA_KEY]?: {
         caption: string;

diff --git a/packages/slate-editor/src/modules/editor-v4/json.ts b/packages/slate-editor/src/modules/editor-v4/json.ts
@@ -1,6 +1,7 @@
+import { Coverage, OEmbedInfo } from '@prezly/sdk';
 import { UploadcareImageStoragePayload, UploadcareStoragePayload } from '@prezly/uploadcare';
 
-import { Coverage, OEmbedInfo, PressContact } from '../../types';
+import { PressContact } from '../../types';
 
 /**
  * Document nodes

diff --git a/packages/slate-editor/src/modules/editor-v4/lib/createEditorValueWithCoverageAsString.ts b/packages/slate-editor/src/modules/editor-v4/lib/createEditorValueWithCoverageAsString.ts
@@ -1,7 +1,7 @@
+import { Coverage } from '@prezly/sdk';
 import { createEmptyValue } from '@prezly/slate-commons';
 
 import { createCoverage } from '../../../modules/editor-v4-coverage';
-import { Coverage } from '../../../types';
 
 import serialize from './serialize';
 

diff --git a/packages/slate-editor/src/modules/tests/data/coverage.ts b/packages/slate-editor/src/modules/tests/data/coverage.ts
@@ -1,4 +1,4 @@
-import { Coverage } from '../../../types';
+import { Coverage } from '@prezly/sdk';
 
 import oembedInfo from './oembedInfo';