Merge branch 'main' into upgraded-nodejs-to-v22.13

Author: AbhayVAshokan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigbinary/neeto-editor",
-  "version": "1.45.2",
+  "version": "1.45.4",
   "types": "./types.d.ts",
   "description": "neetoEditor is the library that drives the rich text experience in all neeto products built at BigBinary",
   "keywords": [

src/common/constants.js

@@ -52,16 +52,52 @@ export const LOOM_URL_REGEXP =
 export const NEETO_RECORD_URL_REGEXP =
   /((?:http|https):\/\/)?(www\.)?[a-zA-Z0-9-]+\.(neetorecord\.com)\/(watch)\/([0-9a-f]{20})/;
 
+export const SUPA_DEMO_URL_REGEXP =
+  /((?:http|https):\/\/)?(www\.)?([a-zA-Z0-9-]+)\.([a-zA-Z0-9-]+\.[a-zA-Z0-9-]+)\/(demo|embed)\/([0-9a-z]+)/;
+
 export const COMBINED_REGEX = new RegExp(
   pluck("source", [
     YOUTUBE_URL_REGEXP,
     VIMEO_URL_REGEXP,
     LOOM_URL_REGEXP,
     NEETO_RECORD_URL_REGEXP,
+    SUPA_DEMO_URL_REGEXP,
   ]).join("|"),
   "g"
 );
 
+export const URL_VALIDATORS = {
+  youtube: url => {
+    const match = url.match(YOUTUBE_URL_REGEXP);
+
+    return match && `https://www.youtube.com/embed/${match[5]}`;
+  },
+  vimeo: url => {
+    const match = url.match(VIMEO_URL_REGEXP);
+
+    return match && `https://player.vimeo.com/video/${match[4]}?h=${match[5]}`;
+  },
+  loom: url => {
+    const match = url.match(LOOM_URL_REGEXP);
+
+    return (
+      match && `https://www.loom.com/embed/${match[4]}?t=${match[5] || ""}`
+    );
+  },
+  neetoRecord: url => {
+    const match = url.match(NEETO_RECORD_URL_REGEXP);
+
+    return match && url.replace("watch", "embeds");
+  },
+  supademo: url => {
+    const match = url.match(SUPA_DEMO_URL_REGEXP);
+
+    return (
+      match && `https://${match[3]}.${match[4]}/embed/${match[6]}?embed_v=2`
+    );
+  },
+};
+
 export const EDITOR_SIZES = {
   MEDIUM: "medium",
   LARGE: "large",

src/components/Editor/CustomExtensions/Embeds/utils.js

@@ -1,38 +1,12 @@
-import {
-  YOUTUBE_URL_REGEXP,
-  VIMEO_URL_REGEXP,
-  LOOM_URL_REGEXP,
-  NEETO_RECORD_URL_REGEXP,
-} from "common/constants";
+import { URL_VALIDATORS } from "common/constants";
 
-export const validateUrl = url =>
-  url
-    ? validateNeetoRecordUrl(url) ||
-      validateYouTubeUrl(url) ||
-      validateLoomUrl(url) ||
-      validateVimeoUrl(url)
-    : false;
+export const validateUrl = url => {
+  if (!url) return false;
 
-export const validateYouTubeUrl = url => {
-  const match = url.match(YOUTUBE_URL_REGEXP);
+  for (const validator of Object.values(URL_VALIDATORS)) {
+    const result = validator(url);
+    if (result) return result;
+  }
 
-  return match && `https://www.youtube.com/embed/${match[5]}`;
-};
-
-export const validateVimeoUrl = url => {
-  const match = url.match(VIMEO_URL_REGEXP);
-
-  return match && `https://player.vimeo.com/video/${match[4]}?h=${match[5]}`;
-};
-
-export const validateLoomUrl = url => {
-  const match = url.match(LOOM_URL_REGEXP);
-
-  return match && `https://www.loom.com/embed/${match[4]}?t=${match[5] || ""}`;
-};
-
-export const validateNeetoRecordUrl = url => {
-  const match = url.match(NEETO_RECORD_URL_REGEXP);
-
-  return match && url.replace("watch", "embeds");
+  return false;
 };

src/translations/en.json

@@ -30,7 +30,7 @@
     },
     "error": {
       "invalidUrl": "Please enter a valid URL",
-      "invalidEmbedUrl": "Supported sources: NeetoRecord, YouTube, Vimeo, Loom.",
+      "invalidEmbedUrl": "Supported sources: NeetoRecord, YouTube, Vimeo, Loom, Supademo.",
       "cannotAddFiles": "Cannot add files",
       "onBeforeFileAddedReturn": "Cannot add the file because onBeforeFileAdded returned false.",
       "fileIsTooLarge": "File size is too large. Max size is {{maxFileSize, anyCase}}.",
@@ -103,7 +103,7 @@
       "emojiDescription": "Add an emoji.",
       "divider": "Divider",
       "dividerDescription": "Add an horizontal line to separate sections.",
-      "embed": "Embed Youtube/Loom/Vimeo",
+      "embed": "Embed Youtube/Loom/Vimeo/Supademo",
       "embedDescription": "Embed a video from major services.",
       "pasteUnformatted": "Paste Unformatted",
       "pasteUnformattedDescription": "Paste by removing all styles.",

stories/constants.js

@@ -14,7 +14,10 @@ export const EDITOR_ADDONS_TABLE_ROWS = [
   ["table", "Add a table to the editor."],
   ["undo", "Undo last performed action."],
   ["video-upload", "Upload videos to the editor."],
-  ["video-embed", "Embed videos from neetoRecord, YouTube, Loom and Vimeo."],
+  [
+    "video-embed",
+    "Embed videos from neetoRecord, YouTube, Loom, Vimeo, and Supademo.",
+  ],
   ["text-color", "Change the color of the text."],
 ];