@innovastudio/contentbuilder 1.4.84 → 1.4.86

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@innovastudio/contentbuilder",
   "type": "module",
-  "version": "1.4.84",
+  "version": "1.4.86",
   "description": "",
   "main": "public/contentbuilder/contentbuilder.esm.js",
   "files": [
@@ -58,6 +58,6 @@
     "rangy": "^1.3.0",
     "socket.io-client": "^4.7.1",
     "sortablejs": "^1.14.0",
-    "string-similarity": "^4.0.4"
+    "string-similarity-js": "^2.1.4"
   }
 }

package/public/contentbuilder/contentbuilder.esm.js

@@ -8547,7 +8547,7 @@ class Dom {
 
 var js$1 = {exports: {}};
 
-var src$1 = {};
+var src = {};
 
 var javascript = {exports: {}};
 
@@ -13686,9 +13686,9 @@ function style_html(html_source, options, js, css) {
 }
 style_html.defaultOptions = html_beautify.defaultOptions;
 
-src$1.js = js_beautify;
-src$1.css = css_beautify;
-src$1.html = style_html;
+src.js = js_beautify;
+src.css = css_beautify;
+src.html = style_html;
 
 /*jshint node:true */
 
@@ -13731,7 +13731,7 @@ function get_beautify(js_beautify, css_beautify, html_beautify) {
 
 {
   (function(mod) {
-    var beautifier = src$1;
+    var beautifier = src;
     beautifier.js_beautify = beautifier.js;
     beautifier.css_beautify = beautifier.css;
     beautifier.html_beautify = beautifier.html;
@@ -58804,6 +58804,33 @@ class ColumnTool {
         util.clearControls();
       });
 
+      /*
+      const fixLayout = (row) => {
+          let hasFixed = false;
+          let elm = row.firstElementChild;
+          let cols = this.builder.cols;
+          cols.forEach(item=>{
+              let elmClass = elm.getAttribute('class');
+              if(elmClass) {
+                  // console.log(elmClass, item);
+                  if(elmClass.indexOf(item)!==-1) {
+                      hasFixed=true;
+                  }
+              }
+          });
+          // console.log('result:' + hasFixed);
+          if(!hasFixed) {
+              if(this.builder.framework==='foundation') Array.from(row.children).map((item) => {
+                  if(item.classList.contains('is-row-tool')) return;
+                  if(item.classList.contains('is-col-tool')) return;
+                  if(item.classList.contains('is-rowadd-tool')) return;
+                  item.classList.remove('column');
+              });
+              util.fixLayout(row);
+          }
+      };
+      */
+
       // Increase
       elm = columnMore.querySelector('.cell-increase');
       dom.addEventListener(elm, 'click', () => {
@@ -58831,7 +58858,10 @@ class ColumnTool {
             });
             util.fixLayout(row);
           }
+
+          // fixLayout(row);
         }
+
         this.grid.increaseColumn();
 
         // Refresh Module
@@ -58875,7 +58905,10 @@ class ColumnTool {
             });
             util.fixLayout(row);
           }
+
+          // fixLayout(row);
         }
+
         this.grid.decreaseColumn();
 
         // Refresh Module
@@ -77583,6 +77616,9 @@ class Dictation {
                     transform: rotate(450deg);
                 }
             }
+            .inp-command::placeholder {
+                color: #aaa;
+            }
         </style>
         <div class="is-overlay page-command-overlay">
             <svg class="spinner" width="40px" height="40px" viewBox="0 0 66 66" xmlns="http://www.w3.org/2000/svg">
@@ -77980,9 +78016,15 @@ class Dictation {
           if (transcript && message.data.is_final) {
             finalTranscripts += ' ' + transcript;
           }
+
+          // Format
+          finalTranscripts = finalTranscripts.charAt(0).toUpperCase() + finalTranscripts.slice(1);
+          finalTranscripts = finalTranscripts.trim();
           inpCommand.value = finalTranscripts;
           clearTimeout(speechTimeout);
+          console.log('Writing..');
           speechTimeout = setTimeout(() => {
+            console.log('Clear');
             this.builder.commandText = '';
             finalTranscripts = '';
             if (this.builder.autoSendCommand) {
@@ -78083,72 +78125,51 @@ class Dictation {
   }
 }
 
-var src = {
-	compareTwoStrings:compareTwoStrings,
-	findBestMatch:findBestMatch
+var stringSimilarity = {};
+
+(function (exports) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringSimilarity = void 0;
+/* global exports, Map */
+/**
+ * Calculate similarity between two strings
+ * @param {string} str1 First string to match
+ * @param {string} str2 Second string to match
+ * @param {number} [substringLength=2] Optional. Length of substring to be used in calculating similarity. Default 2.
+ * @param {boolean} [caseSensitive=false] Optional. Whether you want to consider case in string matching. Default false;
+ * @returns Number between 0 and 1, with 0 being a low match score.
+ */
+var stringSimilarity = function (str1, str2, substringLength, caseSensitive) {
+    if (substringLength === void 0) { substringLength = 2; }
+    if (caseSensitive === void 0) { caseSensitive = false; }
+    if (!caseSensitive) {
+        str1 = str1.toLowerCase();
+        str2 = str2.toLowerCase();
+    }
+    if (str1.length < substringLength || str2.length < substringLength)
+        return 0;
+    var map = new Map();
+    for (var i = 0; i < str1.length - (substringLength - 1); i++) {
+        var substr1 = str1.substr(i, substringLength);
+        map.set(substr1, map.has(substr1) ? map.get(substr1) + 1 : 1);
+    }
+    var match = 0;
+    for (var j = 0; j < str2.length - (substringLength - 1); j++) {
+        var substr2 = str2.substr(j, substringLength);
+        var count = map.has(substr2) ? map.get(substr2) : 0;
+        if (count > 0) {
+            map.set(substr2, count - 1);
+            match++;
+        }
+    }
+    return (match * 2) / (str1.length + str2.length - ((substringLength - 1) * 2));
 };
+exports.stringSimilarity = stringSimilarity;
+exports.default = exports.stringSimilarity;
 
-function compareTwoStrings(first, second) {
-	first = first.replace(/\s+/g, '');
-	second = second.replace(/\s+/g, '');
-
-	if (first === second) return 1; // identical or empty
-	if (first.length < 2 || second.length < 2) return 0; // if either is a 0-letter or 1-letter string
-
-	let firstBigrams = new Map();
-	for (let i = 0; i < first.length - 1; i++) {
-		const bigram = first.substring(i, i + 2);
-		const count = firstBigrams.has(bigram)
-			? firstBigrams.get(bigram) + 1
-			: 1;
-
-		firstBigrams.set(bigram, count);
-	}
-	let intersectionSize = 0;
-	for (let i = 0; i < second.length - 1; i++) {
-		const bigram = second.substring(i, i + 2);
-		const count = firstBigrams.has(bigram)
-			? firstBigrams.get(bigram)
-			: 0;
-
-		if (count > 0) {
-			firstBigrams.set(bigram, count - 1);
-			intersectionSize++;
-		}
-	}
-
-	return (2.0 * intersectionSize) / (first.length + second.length - 2);
-}
-
-function findBestMatch(mainString, targetStrings) {
-	if (!areArgsValid(mainString, targetStrings)) throw new Error('Bad arguments: First argument should be a string, second should be an array of strings');
-	
-	const ratings = [];
-	let bestMatchIndex = 0;
-
-	for (let i = 0; i < targetStrings.length; i++) {
-		const currentTargetString = targetStrings[i];
-		const currentRating = compareTwoStrings(mainString, currentTargetString);
-		ratings.push({target: currentTargetString, rating: currentRating});
-		if (currentRating > ratings[bestMatchIndex].rating) {
-			bestMatchIndex = i;
-		}
-	}
-	
-	
-	const bestMatch = ratings[bestMatchIndex];
-	
-	return { ratings: ratings, bestMatch: bestMatch, bestMatchIndex: bestMatchIndex };
-}
-
-function areArgsValid(mainString, targetStrings) {
-	if (typeof mainString !== 'string') return false;
-	if (!Array.isArray(targetStrings)) return false;
-	if (!targetStrings.length) return false;
-	if (targetStrings.find( function (s) { return typeof s !== 'string'})) return false;
-	return true;
-}
+}(stringSimilarity));
 
+// import stringSimilarity from 'string-similarity';
 class Similarity {
   constructor(builder) {
     this.builder = builder;
@@ -78178,7 +78199,7 @@ class Similarity {
     const normalizedCommand = command.toLowerCase();
     let maxSimilarity = 0;
     for (const cmd of list) {
-      const similarity = src.compareTwoStrings(normalizedCommand, cmd);
+      const similarity = stringSimilarity.stringSimilarity(normalizedCommand, cmd);
       if (similarity > maxSimilarity) {
         // console.log(list)
         // console.log(similarity)
@@ -78808,7 +78829,7 @@ class ContentBuilder {
       sendCommandUrl: 'http://localhost:8081/answer',
       // speechTranscribeUrl: 'http://192.168.1.7:8081',
       onlineDemo: false,
-      autoSendDelay: 3000,
+      autoSendDelay: 4000,
       commandPlaceholderText: '',
       enableShortCommands: true,
       speechRecognitionLang: 'en-US',