@mirrormedia/lilith-draft-editor 3.0.8 → 3.0.10

package/lib/draft-js/buttons/annotation.js

@@ -112,7 +112,5 @@ function AnnotationButton(props) {
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, urlInput, /*#__PURE__*/_react.default.createElement("div", {
     className: className,
     onMouseDown: isActive ? removeAnnotation : promptForAnnotation
-  }, /*#__PURE__*/_react.default.createElement("i", {
-    className: "far"
-  }), /*#__PURE__*/_react.default.createElement("span", null, "Annotation")));
+  }, /*#__PURE__*/_react.default.createElement("span", null, "Annotation")));
 }

package/lib/draft-js/buttons/embedded-code.js

@@ -103,7 +103,5 @@ function EmbeddedCodeButton(props) {
       promptForInput();
     },
     className: className
-  }, /*#__PURE__*/_react.default.createElement("i", {
-    className: "far"
-  }), /*#__PURE__*/_react.default.createElement("span", null, "Embed")));
+  }, /*#__PURE__*/_react.default.createElement("span", null, "Embed")));
 }

package/lib/draft-js/buttons/image.js

@@ -28,29 +28,30 @@ function ImageButton(props) {
     setToShowImageSelector(true);
   };
 
-  const onImageSelectorChange = (selectedImagesWithMeta, align) => {
-    const selected = selectedImagesWithMeta === null || selectedImagesWithMeta === void 0 ? void 0 : selectedImagesWithMeta[0];
-
-    if (!selected) {
+  const onImageSelectorChange = (selectedImages, align) => {
+    if (selectedImages.length === 0) {
       setToShowImageSelector(false);
-      return;
     }
 
-    const contentState = editorState.getCurrentContent();
-    const contentStateWithEntity = contentState.createEntity('image', 'IMMUTABLE', { ...selected.image,
-      desc: selected.desc,
-      url: selected.url,
-      alignment: align
-    });
-    const entityKey = contentStateWithEntity.getLastCreatedEntityKey();
+    let newEditorState = editorState;
 
-    const newEditorState = _draftJs.EditorState.set(editorState, {
-      currentContent: contentStateWithEntity
-    }); // The third parameter here is a space string, not an empty string
-    // If you set an empty string, you will get an error: Unknown DraftEntity key: null
+    for (const selectedImage of selectedImages) {
+      const contentState = newEditorState.getCurrentContent();
+      const contentStateWithEntity = contentState.createEntity('image', 'IMMUTABLE', { ...selectedImage.image,
+        desc: selectedImage.desc,
+        url: selectedImage.url,
+        alignment: align
+      });
+      const entityKey = contentStateWithEntity.getLastCreatedEntityKey();
+      newEditorState = _draftJs.EditorState.set(newEditorState, {
+        currentContent: contentStateWithEntity
+      }); // The third parameter here is a space string, not an empty string
+      // If you set an empty string, you will get an error: Unknown DraftEntity key: null
 
+      newEditorState = _draftJs.AtomicBlockUtils.insertAtomicBlock(newEditorState, entityKey, ' ');
+    }
 
-    onChange(_draftJs.AtomicBlockUtils.insertAtomicBlock(newEditorState, entityKey, ' '));
+    onChange(newEditorState);
     setToShowImageSelector(false);
   };
 
@@ -58,7 +59,8 @@ function ImageButton(props) {
     onChange: onImageSelectorChange,
     enableCaption: true,
     enableUrl: true,
-    enableAlignment: true
+    enableAlignment: true,
+    enableMultiSelect: true
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: className,
     onClick: promptForImageSelector

package/lib/draft-js/buttons/info-box.js

@@ -142,7 +142,5 @@ function InfoBoxButton(props) {
     onClick: () => {
       setToShowInput(true);
     }
-  }, /*#__PURE__*/_react.default.createElement("i", {
-    className: "far"
-  }), /*#__PURE__*/_react.default.createElement("span", null, "InfoBox")));
+  }, /*#__PURE__*/_react.default.createElement("span", null, "InfoBox")));
 }

package/lib/draft-js/draft-converter/index.js

@@ -43,6 +43,8 @@ const inlineTagMap = {
   CODE: ['<code>', '</code>'],
   default: ['<span>', '</span>'],
   ITALIC: ['<em>', '</em>'],
+  SUP: ['<sup>', '</sup>'],
+  SUB: ['<sub>', '</sub>'],
   UNDERLINE: ['<u>', '</u>']
 };
 const defaultEntityTagMap = {

package/lib/website/mirrordaily/selector/image-selector.js

@@ -23,6 +23,10 @@ var _searchBox = require("./search-box");
 
 var _pagination = require("./pagination");
 
+var _button = require("@keystone-ui/button");
+
+var _imageUploader = require("./image-uploader");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -77,6 +81,9 @@ const GlobalStyle = (0, _styledComponents.createGlobalStyle)`
 const ImageSearchBox = (0, _styledComponents.default)(_searchBox.SearchBox)`
   margin-top: 10px;
 `;
+const CustomButton = (0, _styledComponents.default)(_button.Button)`
+  margin-top: 10px;
+`;
 const ImageSelectionWrapper = _styledComponents.default.div`
   overflow: auto;
   margin-top: 10px;
@@ -89,7 +96,7 @@ const ImageGridsWrapper = _styledComponents.default.div`
   margin-top: 5px;
 `;
 const ImageGridWrapper = _styledComponents.default.div`
-  flex: 0 0 33.3333%;
+  width: 33.3333%;
   cursor: pointer;
   padding: 0 10px 10px;
 `;
@@ -99,7 +106,7 @@ const ImageMetaGridsWrapper = _styledComponents.default.div`
   overflow: auto;
 `;
 const ImageMetaGridWrapper = _styledComponents.default.div`
-  flex: 0 0 33.3333%;
+  width: 33.3333%;
   cursor: pointer;
   padding: 0 10px 10px;
 `;
@@ -107,7 +114,7 @@ const Image = _styledComponents.default.img`
   display: block;
   width: 100%;
   aspect-ratio: 2;
-  object-fit: cover;
+  object-fit: contain;
 `;
 const Label = _styledComponents.default.label`
   display: block;
@@ -287,6 +294,7 @@ function ImageSelector(props) {
   const [selected, setSelected] = (0, _react.useState)(initialSelected);
   const [delay, setDelay] = (0, _react.useState)(initialDelay ?? '5');
   const [align, setAlign] = (0, _react.useState)(initialAlign);
+  const [showImageUploader, setShowImageUploader] = (0, _react.useState)(false);
   const contentWrapperRef = (0, _react.useRef)(null);
   const pageSize = 18;
   const options = [{
@@ -336,6 +344,15 @@ function ImageSelector(props) {
     }
   };
 
+  const onImageUploaderChange = images => {
+    setSelected(prev => prev.concat(images.map(image => ({
+      image,
+      desc: '',
+      url: ''
+    }))));
+    setShowImageUploader(false);
+  };
+
   const onImageMetaChange = imageEntityWithMeta => {
     if (enableMultiSelect) {
       const foundIndex = selected.findIndex(ele => {
@@ -438,7 +455,9 @@ function ImageSelector(props) {
     width: "narrow"
   }, /*#__PURE__*/_react.default.createElement("div", {
     ref: contentWrapperRef
-  }, /*#__PURE__*/_react.default.createElement(ImageSearchBox, {
+  }, /*#__PURE__*/_react.default.createElement(CustomButton, {
+    onClick: () => setShowImageUploader(true)
+  }, "\u4E0A\u50B3\u5716\u7247"), /*#__PURE__*/_react.default.createElement(ImageSearchBox, {
     onChange: onSearchBoxChange
   }), /*#__PURE__*/_react.default.createElement(ImageSelectionWrapper, null, /*#__PURE__*/_react.default.createElement("div", null, searchResult), !!selected.length && /*#__PURE__*/_react.default.createElement(SeparationLine, null), /*#__PURE__*/_react.default.createElement(ImageMetaGrids, {
     imageMetas: selected,
@@ -455,5 +474,7 @@ function ImageSelector(props) {
     options: options,
     onChange: onAlignSelectChange,
     onOpen: onAlignSelectOpen
-  }))))));
+  }))))), showImageUploader && /*#__PURE__*/_react.default.createElement(_imageUploader.ImageUploader, {
+    onChange: onImageUploaderChange
+  }));
 }

package/lib/website/mirrordaily/selector/image-uploader.js

@@ -0,0 +1,247 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ImageUploader = ImageUploader;
+
+var _apollo = require("@keystone-6/core/admin-ui/apollo");
+
+var _modals = require("@keystone-ui/modals");
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
+var _fileConvert = require("../utils/file-convert");
+
+var _button = require("@keystone-ui/button");
+
+var _fields = require("@keystone-ui/fields");
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+const imagesMutation = (0, _apollo.gql)`
+  mutation AddPhotos($data: [PhotoCreateInput!]!) {
+    photos: createPhotos(data: $data) {
+      id
+      name
+      imageFile {
+        url
+        width
+        height
+      }
+      resized {
+        original
+        w480
+        w800
+        w1200
+        w1600
+        w2400
+      }
+      resizedWebp {
+        original
+        w480
+        w800
+        w1200
+        w1600
+        w2400
+      }
+    }
+  }
+`;
+const CustomButton = (0, _styledComponents.default)(_button.Button)`
+  margin-top: 10px;
+`;
+const HiddenInput = _styledComponents.default.input`
+  display: none;
+`;
+const ImagesWrapper = _styledComponents.default.div`
+  overflow: auto;
+  margin-top: 10px;
+`;
+const ImageFilesWrapper = _styledComponents.default.div`
+  display: flex;
+  flex-wrap: wrap;
+  overflow: auto;
+`;
+const ImageFileWrapper = _styledComponents.default.div`
+  width: 33%;
+  cursor: pointer;
+  padding: 0 10px 10px;
+`;
+const Image = _styledComponents.default.img`
+  display: block;
+  width: 100%;
+  aspect-ratio: 2;
+  object-fit: contain;
+`;
+const ImageName = _styledComponents.default.p`
+  text-align: center;
+`;
+const CustomCheckbox = (0, _styledComponents.default)(_fields.Checkbox)`
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+`;
+const Label = _styledComponents.default.label`
+  display: block;
+  margin: 10px 0;
+  font-weight: 600;
+`;
+
+const AddImages = ({
+  onAddImages
+}) => {
+  const inputRef = (0, _react.useRef)(null);
+
+  const inputChangeHandler = async event => {
+    const files = event.target.files;
+    event.target.files = null;
+    if (!files) return;
+    const imagesFiles = await (0, _fileConvert.convertFilesToImageData)(files);
+    console.log('imagesFiles', imagesFiles);
+    onAddImages(imagesFiles);
+  };
+
+  const onUploadButton = () => {
+    var _inputRef$current;
+
+    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.click();
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(CustomButton, {
+    onClick: onUploadButton
+  }, "\u65B0\u589E\u5716\u7247"), /*#__PURE__*/_react.default.createElement(HiddenInput, {
+    type: "file",
+    multiple: true,
+    accept: "image/*",
+    ref: inputRef,
+    onChange: inputChangeHandler
+  }));
+};
+
+const ImageFiles = ({
+  files,
+  onChange
+}) => {
+  return /*#__PURE__*/_react.default.createElement(ImageFilesWrapper, null, files.map(file => /*#__PURE__*/_react.default.createElement(ImageFile, {
+    key: file.uid,
+    file: file,
+    onChange: onChange
+  })));
+};
+
+const ImageFile = ({
+  file,
+  onChange
+}) => {
+  return /*#__PURE__*/_react.default.createElement(ImageFileWrapper, null, /*#__PURE__*/_react.default.createElement(Image, {
+    src: file.blobURL
+  }), /*#__PURE__*/_react.default.createElement(Label, {
+    htmlFor: "name"
+  }, "Image Name"), /*#__PURE__*/_react.default.createElement(_fields.TextInput, {
+    id: "name",
+    type: "text",
+    defaultValue: file.name,
+    onChange: _lodash.default.debounce(e => {
+      onChange({ ...file,
+        name: e.target.value
+      });
+    })
+  }), /*#__PURE__*/_react.default.createElement(ImageName, null, file.name), /*#__PURE__*/_react.default.createElement(CustomCheckbox, {
+    defaultChecked: file.shouldSetWatermark,
+    onChange: _lodash.default.debounce(e => {
+      onChange({ ...file,
+        shouldSetWatermark: e.target.checked
+      });
+    })
+  }, "\u6D6E\u6C34\u5370"));
+};
+
+function ImageUploader({
+  onChange
+}) {
+  const [files, setFiles] = (0, _react.useState)([]);
+  const [addPhotos, {
+    data: uploadData,
+    loading: uploadLoading,
+    error: uploadError
+  }] = (0, _apollo.useMutation)(imagesMutation);
+
+  const onAddImages = rawFiles => {
+    const existedImageUids = new Set(files.map(file => file.uid));
+    const newFiles = rawFiles.filter(file => !existedImageUids.has(file.uid)).map(rawFile => ({ ...rawFile,
+      shouldSetWatermark: true
+    }));
+    setFiles(prev => prev.concat(newFiles));
+  };
+
+  const onConfirm = async () => {
+    if (!files.length) return onChange([]);
+    const tasks = files.map(async data => ({ ...data,
+      file: await (0, _fileConvert.convertStringToFile)(data.blobURL, data.name, data.type)
+    }));
+    const data = (await Promise.allSettled(tasks)).filter(function (settledResult) {
+      return settledResult.status === 'fulfilled';
+    }).map(result => result.value);
+    addPhotos({
+      variables: {
+        data: data.map(d => ({
+          name: d.name,
+          imageFile: {
+            upload: d.file
+          },
+          waterMark: d.shouldSetWatermark
+        }))
+      }
+    });
+  };
+
+  const onImageFileChang = file => {
+    const newFiles = Array.from(files);
+    const foundIndex = newFiles.findIndex(ele => ele.uid === file.uid);
+
+    if (foundIndex !== -1) {
+      newFiles[foundIndex] = file;
+      setFiles(newFiles);
+    }
+  };
+
+  (0, _react.useEffect)(() => {
+    var _uploadData$photos;
+
+    if (uploadData !== null && uploadData !== void 0 && (_uploadData$photos = uploadData.photos) !== null && _uploadData$photos !== void 0 && _uploadData$photos.length) {
+      onChange(uploadData.photos);
+    }
+  }, [uploadData, onChange]);
+  return /*#__PURE__*/_react.default.createElement(_modals.DrawerController, {
+    isOpen: true
+  }, /*#__PURE__*/_react.default.createElement(_modals.Drawer, {
+    title: "Upload images",
+    actions: {
+      cancel: {
+        label: 'Cancel',
+        action: () => {
+          onChange([]);
+        }
+      },
+      confirm: {
+        label: 'Confirm',
+        action: onConfirm
+      }
+    },
+    width: "narrow"
+  }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(AddImages, {
+    onAddImages: onAddImages
+  }), /*#__PURE__*/_react.default.createElement(ImagesWrapper, null, /*#__PURE__*/_react.default.createElement(ImageFiles, {
+    files: files,
+    onChange: onImageFileChang
+  })), uploadLoading && /*#__PURE__*/_react.default.createElement("div", null, "loading"), uploadError && /*#__PURE__*/_react.default.createElement("div", null, uploadError.message))));
+}

package/lib/website/mirrordaily/selector/video-selector.js

@@ -21,6 +21,10 @@ var _pagination = require("./pagination");
 
 var _fields = require("@keystone-ui/fields");
 
+var _videoUploader = require("./video-uploader");
+
+var _button = require("@keystone-ui/button");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -29,9 +33,11 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 const videosQuery = (0, _apollo.gql)`
   query Videos($searchText: String!, $take: Int, $skip: Int) {
-    videosCount(where: { name: { contains: $searchText } })
+    videosCount(
+      where: { name: { contains: $searchText }, state: { equals: "published" } }
+    )
     videos(
-      where: { name: { contains: $searchText } }
+      where: { name: { contains: $searchText }, state: { equals: "published" } }
       orderBy: { id: desc }
       take: $take
       skip: $skip
@@ -39,6 +45,7 @@ const videosQuery = (0, _apollo.gql)`
       id
       name
       videoSrc
+      youtubeUrl
       file {
         filename
         filesize
@@ -70,6 +77,9 @@ const GlobalStyle = (0, _styledComponents.createGlobalStyle)`
 const VideoSearchBox = (0, _styledComponents.default)(_searchBox.SearchBox)`
   margin-top: 10px;
 `;
+const CustomButton = (0, _styledComponents.default)(_button.Button)`
+  margin-top: 10px;
+`;
 const VideoSelectionWrapper = _styledComponents.default.div`
   overflow: auto;
   margin-top: 10px;
@@ -80,7 +90,7 @@ const VideoGridsWrapper = _styledComponents.default.div`
   overflow: auto;
 `;
 const VideoGridWrapper = _styledComponents.default.div`
-  flex: 0 0 33.3333%;
+  width: 33.3333%;
   cursor: pointer;
   padding: 0 10px 10px;
 `;
@@ -90,7 +100,7 @@ const VideoMetaGridsWrapper = _styledComponents.default.div`
   overflow: auto;
 `;
 const VideoMetaGridWrapper = _styledComponents.default.div`
-  flex: 0 0 33.3333%;
+  width: 33.3333%;
   cursor: pointer;
   padding: 0 10px 10px;
 `;
@@ -98,7 +108,7 @@ const Video = _styledComponents.default.video`
   display: block;
   width: 100%;
   aspect-ratio: 2;
-  object-fit: cover;
+  object-fit: contain;
 `;
 const SeparationLine = _styledComponents.default.div`
   border: #e1e5e9 1px solid;
@@ -230,6 +240,7 @@ function VideoSelector(props) {
 
   const [searchText, setSearchText] = (0, _react.useState)('');
   const [selected, setSelected] = (0, _react.useState)([]);
+  const [showVideoUploader, setShowVideoUploader] = (0, _react.useState)(false);
   const pageSize = 6;
   const {
     onChange
@@ -248,6 +259,14 @@ function VideoSelector(props) {
     setCurrentPage(1);
   };
 
+  const onVideoUploaderChange = video => {
+    if (video) setSelected(prev => [...prev, {
+      video,
+      desc: ''
+    }]);
+    setShowVideoUploader(false);
+  };
+
   const onVideoMetaChange = videoEntityWithMeta => {
     setSelected([videoEntityWithMeta]);
   };
@@ -325,10 +344,14 @@ function VideoSelector(props) {
       }
     },
     width: "narrow"
-  }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(VideoSearchBox, {
+  }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(CustomButton, {
+    onClick: () => setShowVideoUploader(true)
+  }, "\u4E0A\u50B3\u5F71\u7247"), /*#__PURE__*/_react.default.createElement(VideoSearchBox, {
     onChange: onSearchBoxChange
   }), /*#__PURE__*/_react.default.createElement(VideoSelectionWrapper, null, /*#__PURE__*/_react.default.createElement("div", null, searchResult), !!selected.length && /*#__PURE__*/_react.default.createElement(SeparationLine, null), /*#__PURE__*/_react.default.createElement(VideoMetaGrids, {
     videoMetas: selected,
     onChange: onVideoMetaChange
-  }))))));
+  }))))), showVideoUploader && /*#__PURE__*/_react.default.createElement(_videoUploader.VideoUploader, {
+    onChange: onVideoUploaderChange
+  }));
 }