@mirrormedia/lilith-draft-editor 1.1.0-alpha.33 → 1.1.0-alpha.35

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

@@ -38,8 +38,9 @@ function AudioButton(props) {
       return;
     }
 
-    const contentState = editorState.getCurrentContent();
-    const contentStateWithEntity = contentState.createEntity('AUDIO', 'IMMUTABLE', {
+    const contentState = editorState.getCurrentContent(); // since 202310, only AUDIO-V2 will be created
+
+    const contentStateWithEntity = contentState.createEntity('AUDIO-V2', 'IMMUTABLE', {
       audio
     });
     const entityKey = contentStateWithEntity.getLastCreatedEntityKey();

package/lib/draft-js/draft-converter/atomic-block-processor.js

@@ -7,14 +7,10 @@ exports.default = void 0;
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _react = _interopRequireDefault(require("react"));
-
 var _apiDataInstance = _interopRequireDefault(require("./api-data-instance"));
 
 var _entities = _interopRequireDefault(require("./entities"));
 
-var _server = _interopRequireDefault(require("react-dom/server"));
-
 var _draftJs = require("draft-js");
 
 var _draftConvert = require("draft-convert");
@@ -80,44 +76,25 @@ const processor = {
 
       case _entities.default.TABLE.type:
         {
-          var _content, _content2;
+          var _content;
 
           // About TABLE atomic block entity data structure,
           // see `../views/editor/table.tsx` for more information.
           content = entity === null || entity === void 0 ? void 0 : entity.data;
-          /** @type DraftEditor.TableEntity.TableStyles */
-
-          const tableStyles = (_content = content) === null || _content === void 0 ? void 0 : _content.tableStyles;
           /** @type DraftEditor.TableEntity.TableData */
-
-          const tableData = (_content2 = content) === null || _content2 === void 0 ? void 0 : _content2.tableData;
-          const rowsJsx = tableData === null || tableData === void 0 ? void 0 : tableData.map((row, rIndex) => {
-            var _tableStyles$rows;
-
-            const colsJsx = row === null || row === void 0 ? void 0 : row.map((col, cIndex) => {
-              var _tableStyles$columns, _tableStyles$cells, _tableStyles$cells$rI;
-
-              const colStyle = tableStyles === null || tableStyles === void 0 ? void 0 : (_tableStyles$columns = tableStyles.columns) === null || _tableStyles$columns === void 0 ? void 0 : _tableStyles$columns[cIndex];
-              const cellStyle = tableStyles === null || tableStyles === void 0 ? void 0 : (_tableStyles$cells = tableStyles.cells) === null || _tableStyles$cells === void 0 ? void 0 : (_tableStyles$cells$rI = _tableStyles$cells[rIndex]) === null || _tableStyles$cells$rI === void 0 ? void 0 : _tableStyles$cells$rI[cIndex];
-              return /*#__PURE__*/_react.default.createElement("td", {
-                key: `col_${cIndex}`,
-                style: Object.assign({}, colStyle, cellStyle),
-                dangerouslySetInnerHTML: {
-                  __html: (0, _draftConvert.convertToHTML)((0, _draftJs.convertFromRaw)(col))
-                }
-              });
+          // since apiData is now only for app,
+          // keep the rows data structure for app to style the table
+
+          const tableData = (_content = content) === null || _content === void 0 ? void 0 : _content.tableData;
+          const rows = tableData === null || tableData === void 0 ? void 0 : tableData.map(row => {
+            const cols = row === null || row === void 0 ? void 0 : row.map(col => {
+              return {
+                html: (0, _draftConvert.convertToHTML)((0, _draftJs.convertFromRaw)(col))
+              };
             });
-            return /*#__PURE__*/_react.default.createElement("tr", {
-              key: `row_${rIndex}`,
-              style: tableStyles === null || tableStyles === void 0 ? void 0 : (_tableStyles$rows = tableStyles.rows) === null || _tableStyles$rows === void 0 ? void 0 : _tableStyles$rows[rIndex]
-            }, colsJsx);
-          }); // Use `React.renderToStsaticMarkup` to generate plain HTML string
-
-          const html = _server.default.renderToStaticMarkup( /*#__PURE__*/_react.default.createElement("table", null, /*#__PURE__*/_react.default.createElement("tbody", null, rowsJsx)));
-
-          content = [{
-            html
-          }];
+            return cols;
+          });
+          content = rows;
           break;
         }
 
@@ -135,6 +112,7 @@ const processor = {
         break;
 
       case _entities.default.AUDIO.type:
+      case _entities.default['AUDIO-V2'].type:
       case _entities.default.IMAGE.type:
       case _entities.default.IMAGEDIFF.type:
       case _entities.default.SLIDESHOW.type:

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

@@ -30,6 +30,9 @@ const ENTITY = {
   AUDIO: {
     type: 'AUDIO'
   },
+  ['AUDIO-V2']: {
+    type: 'AUDIO-V2'
+  },
   VIDEO: {
     type: 'VIDEO'
   },

package/lib/website/mirrormedia/block-renderer-fn.js

@@ -34,6 +34,7 @@ const {
   VideoBlock,
   VideoBlockV2,
   AudioBlock,
+  AudioBlockV2,
   YoutubeBlock
 } = _mirrormedia.default.blockRenderers;
 
@@ -124,6 +125,11 @@ const AtomicBlock = props => {
         return AudioBlock(entity);
       }
 
+    case 'AUDIO-V2':
+      {
+        return AudioBlockV2(entity);
+      }
+
     case 'YOUTUBE':
       {
         return YoutubeBlock(entity);

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

@@ -102,8 +102,6 @@ function AudioGrid(props) {
   }) : null), /*#__PURE__*/_react.default.createElement(Audio, {
     controls: true
   }, /*#__PURE__*/_react.default.createElement("source", {
-    src: audio === null || audio === void 0 ? void 0 : audio.urlOriginal
-  }), /*#__PURE__*/_react.default.createElement("source", {
     src: audio === null || audio === void 0 ? void 0 : audio.audioSrc
   }), /*#__PURE__*/_react.default.createElement("source", {
     src: audio === null || audio === void 0 ? void 0 : (_audio$file = audio.file) === null || _audio$file === void 0 ? void 0 : _audio$file.url
@@ -136,8 +134,6 @@ function AudioMetaGrid(props) {
   return /*#__PURE__*/_react.default.createElement(AudioMetaGridWrapper, null, /*#__PURE__*/_react.default.createElement(Audio, {
     controls: true
   }, /*#__PURE__*/_react.default.createElement("source", {
-    src: audio === null || audio === void 0 ? void 0 : audio.urlOriginal
-  }), /*#__PURE__*/_react.default.createElement("source", {
     src: audio === null || audio === void 0 ? void 0 : audio.audioSrc
   }), /*#__PURE__*/_react.default.createElement("source", {
     src: audio === null || audio === void 0 ? void 0 : (_audio$file2 = audio.file) === null || _audio$file2 === void 0 ? void 0 : _audio$file2.url
@@ -155,7 +151,6 @@ const AudiosQuery = (0, _apollo.gql)`
     ) {
       id
       name
-      urlOriginal
       audioSrc
       file {
         url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirrormedia/lilith-draft-editor",
-  "version": "1.1.0-alpha.33",
+  "version": "1.1.0-alpha.35",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -23,7 +23,7 @@
   "license": "MIT",
   "dependencies": {
     "draft-js": "^0.11.7",
-    "@mirrormedia/lilith-draft-renderer": "1.3.0-alpha.17"
+    "@mirrormedia/lilith-draft-renderer": "1.3.0-alpha.26"
   },
   "peerDependencies": {
     "react": "18.2.0",