@mirrormedia/lilith-draft-editor 3.0.7 → 3.0.8-beta.2

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

@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 
-var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _fields = require("@keystone-ui/fields");
 
@@ -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); }
@@ -67,9 +71,19 @@ const imagesQuery = (0, _apollo.gql)`
 const _ = {
   debounce: _debounce.default
 };
+const GlobalStyle = (0, _styledComponents.createGlobalStyle)`
+  form {
+    @media (max-width: 575px) {
+      width: 100vw !important;
+    }
+  }
+`;
 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;
@@ -82,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;
 `;
@@ -92,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;
 `;
@@ -280,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 = [{
@@ -329,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 => {
@@ -414,10 +438,10 @@ function ImageSelector(props) {
     searchResult = /*#__PURE__*/_react.default.createElement(ErrorWrapper, null, /*#__PURE__*/_react.default.createElement("h3", null, "Errors occurs in the `images` query"), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("b", null, "Message:"), /*#__PURE__*/_react.default.createElement("div", null, error.message), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("b", null, "Stack:"), /*#__PURE__*/_react.default.createElement("div", null, error.stack), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("b", null, "Query:"), /*#__PURE__*/_react.default.createElement("pre", null, imagesQuery === null || imagesQuery === void 0 ? void 0 : (_imagesQuery$loc = imagesQuery.loc) === null || _imagesQuery$loc === void 0 ? void 0 : (_imagesQuery$loc$sour = _imagesQuery$loc.source) === null || _imagesQuery$loc$sour === void 0 ? void 0 : _imagesQuery$loc$sour.body)));
   }
 
-  return /*#__PURE__*/_react.default.createElement(_modals.DrawerController, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(GlobalStyle, null), /*#__PURE__*/_react.default.createElement(_modals.DrawerController, {
     isOpen: true
   }, /*#__PURE__*/_react.default.createElement(_modals.Drawer, {
-    title: "Select image",
+    title: "Select images",
     actions: {
       cancel: {
         label: 'Cancel',
@@ -427,10 +451,13 @@ function ImageSelector(props) {
         label: 'Confirm',
         action: onSave
       }
-    }
+    },
+    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,
@@ -447,5 +474,7 @@ function ImageSelector(props) {
     options: options,
     onChange: onAlignSelectChange,
     onOpen: onAlignSelectOpen
-  })))));
+  }))))), showImageUploader && /*#__PURE__*/_react.default.createElement(_imageUploader.ImageUploader, {
+    onChange: onImageUploaderChange
+  }));
 }

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

@@ -0,0 +1,312 @@
+"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 Label = _styledComponents.default.label`
+  display: block;
+  margin: 10px 0;
+  font-weight: 600;
+`;
+const CustomCheckbox = (0, _styledComponents.default)(_fields.Checkbox)`
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+`;
+const WatermarkTypeWrapper = _styledComponents.default.div`
+  margin-top: 10px;
+`;
+const WatermarkToggleWrapper = _styledComponents.default.div`
+  margin-top: 10px;
+  padding: 10px;
+  background-color: #f5f5f5;
+  border-radius: 4px;
+`;
+
+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"), file.shouldSetWatermark && /*#__PURE__*/_react.default.createElement(WatermarkTypeWrapper, null, /*#__PURE__*/_react.default.createElement(_fields.Select, {
+    value: {
+      label: file.watermarkType === 'mirrordaily' ? '鏡報' : '鏡週刊',
+      value: file.watermarkType
+    },
+    onChange: option => {
+      onChange({ ...file,
+        watermarkType: (option === null || option === void 0 ? void 0 : option.value) || 'mirrormedia'
+      });
+    },
+    options: [{
+      label: '鏡週刊',
+      value: 'mirrormedia'
+    }, {
+      label: '鏡報',
+      value: 'mirrordaily'
+    }]
+  })));
+};
+
+function ImageUploader({
+  onChange
+}) {
+  const [files, setFiles] = (0, _react.useState)([]);
+  const [watermarkAll, setWatermarkAll] = (0, _react.useState)(true);
+  const [watermarkTypeAll, setWatermarkTypeAll] = (0, _react.useState)('mirrormedia');
+  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: watermarkAll,
+      watermarkType: watermarkTypeAll
+    }));
+    setFiles(prev => prev.concat(newFiles));
+  };
+
+  const toggleAllWatermarks = checked => {
+    setWatermarkAll(checked);
+    setFiles(prev => prev.map(file => ({ ...file,
+      shouldSetWatermark: checked
+    })));
+  };
+
+  const changeAllWatermarkTypes = type => {
+    setWatermarkTypeAll(type);
+    setFiles(prev => prev.map(file => ({ ...file,
+      watermarkType: type
+    })));
+  };
+
+  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,
+          watermarkType: d.watermarkType
+        }))
+      }
+    });
+  };
+
+  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
+  }), files.length > 0 && /*#__PURE__*/_react.default.createElement(WatermarkToggleWrapper, null, /*#__PURE__*/_react.default.createElement(CustomCheckbox, {
+    checked: watermarkAll,
+    onChange: e => {
+      toggleAllWatermarks(e.target.checked);
+    }
+  }, "\u5168\u90E8\u52A0\u4E0A\u6D6E\u6C34\u5370"), watermarkAll && /*#__PURE__*/_react.default.createElement(WatermarkTypeWrapper, null, /*#__PURE__*/_react.default.createElement(_fields.Select, {
+    value: {
+      label: watermarkTypeAll === 'mirrordaily' ? '鏡報' : '鏡週刊',
+      value: watermarkTypeAll
+    },
+    onChange: option => {
+      const type = (option === null || option === void 0 ? void 0 : option.value) || 'mirrormedia';
+      changeAllWatermarkTypes(type);
+    },
+    options: [{
+      label: '鏡週刊',
+      value: 'mirrormedia'
+    }, {
+      label: '鏡報',
+      value: 'mirrordaily'
+    }]
+  }))), /*#__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/mirrormedia/utils/file-convert.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.convertBlobToString = convertBlobToString;
+exports.convertFilesToImageData = convertFilesToImageData;
+exports.convertStringToFile = convertStringToFile;
+
+var _jsSha = require("js-sha256");
+
+async function convertFilesToMediaData(fileList, isValidFile, wrapResult) {
+  const files = Array.from(fileList);
+  const fileNamePostfix = new Intl.DateTimeFormat('fr-CA', {
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit'
+  }).format(Date.now());
+  const tasks = files.map(async file => {
+    if (!isValidFile(file)) return;
+    const uInt8Data = await file.arrayBuffer();
+    const name = file.name;
+    const positionOfLastDot = name.lastIndexOf('.');
+    const filename = positionOfLastDot > -1 ? `${name.slice(0, positionOfLastDot)}_${fileNamePostfix}${name.slice(positionOfLastDot)}` : `${name}_${fileNamePostfix}`;
+    return wrapResult({
+      uid: (0, _jsSha.sha256)(uInt8Data),
+      name: filename,
+      type: file.type,
+      blobURL: convertBlobToString(file)
+    });
+  });
+  const results = await Promise.allSettled(tasks);
+  return results.filter(r => r.status === 'fulfilled').map(r => r.value).filter(r => Boolean(r));
+}
+
+function isImageFile(file) {
+  return file.type.startsWith('image/');
+}
+
+async function convertFilesToImageData(fileList) {
+  return convertFilesToMediaData(fileList, isImageFile, ({
+    uid,
+    name,
+    type,
+    blobURL
+  }) => ({
+    uid,
+    name,
+    type,
+    blobURL
+  }));
+}
+
+function blobToFile(blob, fileName, extension) {
+  return new File([blob], fileName, {
+    type: extension
+  });
+}
+
+function convertBlobToString(blob) {
+  return URL.createObjectURL(blob);
+}
+
+async function convertStringToFile(str, fileName, extension) {
+  const request = new Request(str);
+  return await fetch(request).then(response => response.blob()).then(blob => blobToFile(blob, fileName, extension ?? blob.type));
+}

package/lib/website/readr/draft-editor.js

@@ -77,6 +77,8 @@ const buttonNames = {
   // inline styles
   bold: 'bold',
   italic: 'italic',
+  sup: 'sup',
+  sub: 'sub',
   underline: 'underline',
   code: 'code',
   // block styles
@@ -439,6 +441,12 @@ class RichTextEditor extends _react.default.Component {
         fontFamily: '"Inconsolata", "Menlo", "Consolas", monospace',
         fontSize: 16,
         padding: 2
+      },
+      SUP: {
+        verticalAlign: 'super'
+      },
+      SUB: {
+        verticalAlign: 'sub'
       }
     };
   }
@@ -920,6 +928,14 @@ const inlineStyles = [{
   label: 'Italic',
   style: 'ITALIC',
   icon: 'fas fa-italic'
+}, {
+  label: 'Superscript',
+  style: 'SUP',
+  icon: 'fas fa-superscript'
+}, {
+  label: 'Subscript',
+  style: 'SUB',
+  icon: 'fas fa-subscript'
 }, {
   label: 'Underline',
   style: 'UNDERLINE',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirrormedia/lilith-draft-editor",
-  "version": "3.0.7",
+  "version": "3.0.8-beta.2",
   "description": "",
   "main": "lib/index.js",
   "scripts": {