sccoreui 5.9.3 → 5.9.4

package/dist/components/formula-template/FormulaCoponent.js

@@ -45,8 +45,8 @@ const FormulaComponent = (props) => {
         else {
             setSelectedItem([item.id]);
         }
-        let chipElm = ` <div class="formulaChipElm max-w-8rem w-max h-2rem overflow-hidden text-overflow-ellipsis white-space-nowrap bg-blue-100 text-gray-600 border-round-sm p-1 ${props.formulaChipClassName}" contentEditable=${false} itemId=${item === null || item === void 0 ? void 0 : item.id} title=${item === null || item === void 0 ? void 0 : item.name}>${item === null || item === void 0 ? void 0 : item.name}</div> `;
-        let currentText = contentEditableDivRef.current.innerHTML === '<span class="formulaSpanElm"></span>' ? '<span class="formulaSpanElm"></span>' : contentEditableDivRef.current.innerHTML;
+        let chipElm = `<div class="formulaChipElm max-w-8rem w-max h-2rem overflow-hidden text-overflow-ellipsis white-space-nowrap bg-blue-100 text-gray-600 border-round-sm p-1 ${props.formulaChipClassName}" contentEditable=${false} itemId=${item === null || item === void 0 ? void 0 : item.id} title=${item === null || item === void 0 ? void 0 : item.name}>${item === null || item === void 0 ? void 0 : item.name}</div>`;
+        let currentText = contentEditableDivRef.current.innerHTML === '<span class="formulaSpanElm"></span>' ? '<span class="formulaSpanElm"></span>' : contentEditableDivRef.current.innerHTML.replaceAll('<br>', '');
         const index = contentEditableDivRef.current.innerHTML.indexOf((_a = document.querySelector('.formulaSpanElm.activeSpanElm')) === null || _a === void 0 ? void 0 : _a.outerHTML);
         if (index === -1 && (contentEditableCursorIndex === null || contentEditableCursorIndex === 0)) {
             let str = currentText + chipElm + `<span class='formulaSpanElm activeSpanElm'></span>`;
@@ -84,7 +84,6 @@ const FormulaComponent = (props) => {
         let spanElms = Array.from(document.querySelectorAll('.formulaSpanElm'));
         if (spanElms.length > 1) {
             let spanInnerText = spanElms === null || spanElms === void 0 ? void 0 : spanElms.map((x) => x === null || x === void 0 ? void 0 : x.innerHTML);
-            // debugger
             // remove first and last span
             const specialCharacters = /[/*\-+%(]/;
             if (spanInnerText[0] !== "" && !specialCharacters.test(spanInnerText[0].charAt(spanInnerText[0].length - 1))) {
@@ -94,17 +93,15 @@ const FormulaComponent = (props) => {
             else if (specialCharacters.test(spanInnerText[0].charAt(spanInnerText[0].length - 1)) || spanInnerText[0] === "") {
                 spanInnerText.shift();
             }
-            if (spanInnerText[spanInnerText.length - 1] !== "" && !specialCharacters.test(spanInnerText[spanInnerText.length - 1].charAt(0))) {
-                setIsValid(false);
-                return;
-            }
-            else if (spanInnerText[spanInnerText.length - 1] === "" || specialCharacters.test(spanInnerText[spanInnerText.length - 1].charAt(0))) {
+            if (spanInnerText[spanInnerText.length - 1] === "" || specialCharacters.test(spanInnerText[spanInnerText.length - 1].charAt(0))) {
                 spanInnerText.pop();
             }
             // spanInnerText = spanInnerText.slice(0, 1)
             // spanInnerText = spanInnerText.slice(0, spanElms.length - 1)
             // const specialCharacters = /[/*\-+%(]/;
             let findText = spanInnerText.find((x) => !specialCharacters.test(x.charAt(0)) || !specialCharacters.test(x.charAt(x.length - 1)));
+            if (findText)
+                findText = findText.replaceAll('<br>', '');
             if (findText) {
                 setIsValid(false);
                 return;
@@ -154,17 +151,22 @@ const FormulaComponent = (props) => {
     function getCursorPosition(contentEditableElm) {
         var _a;
         const selection = window.getSelection();
-        const range = selection.getRangeAt(0);
-        const clonedRange = range.cloneRange();
-        clonedRange.selectNodeContents(contentEditableElm);
-        clonedRange.setEnd(range.endContainer, range.endOffset);
-        setContentEditableCursorIndex((_a = clonedRange === null || clonedRange === void 0 ? void 0 : clonedRange.toString()) === null || _a === void 0 ? void 0 : _a.length);
+        if (selection.anchorNode) {
+            const range = selection.getRangeAt(0);
+            const clonedRange = range.cloneRange();
+            clonedRange.selectNodeContents(contentEditableElm);
+            clonedRange.setEnd(range.endContainer, range.endOffset);
+            setContentEditableCursorIndex((_a = clonedRange === null || clonedRange === void 0 ? void 0 : clonedRange.toString()) === null || _a === void 0 ? void 0 : _a.length);
+        }
     }
     const onConditionKeyDown = (event) => {
         const content = event.target.textContent.trim();
         const lastChar = content.charAt(content.length - 1);
         const operators = ['%', '*', '-', '+', '/'];
         let selection = window.getSelection();
+        let actElm = document.querySelector('.formulaSpanElm.activeSpanElm');
+        if (actElm && actElm.innerHTML.indexOf('<br>') !== -1)
+            actElm.innerHTML = actElm.textContent;
         if (event.keyCode === 37 || event.keyCode === 39 || event.keyCode === 38 || event.keyCode === 40) {
             let actElm = document.querySelector('.formulaSpanElm.activeSpanElm');
             let spanElms = Array.from(document.querySelectorAll('.formulaSpanElm'));
@@ -177,25 +179,29 @@ const FormulaComponent = (props) => {
                 }
             });
             if (actElm) {
-                if ((event.keyCode === 37 /* ArrowLeft */ || event.keyCode === 38 /* ArrowUp */) && selection.focusOffset === 0) {
-                    activeIndex = activeIndex - 1;
-                }
-                else if ((event.keyCode === 39 /* ArrowRight */ || event.keyCode === 40 /* ArrowDown */) && selection.focusOffset === selection.focusNode.textContent.length) {
-                    activeIndex = activeIndex + 1;
+                if (event.keyCode === 37 /* ArrowLeft */ || event.keyCode === 38 /* ArrowUp */) {
+                    if (selection.getRangeAt(0).endOffset !== 0 && actElm.innerText.length !== 0) {
+                        getCursorPosition(actElm);
+                        return;
+                    }
+                    if (activeIndex !== 0) {
+                        // activeIndex = activeIndex + 1
+                        activeIndex = activeIndex - 1;
+                    }
                 }
-                else {
-                    event.preventDefault();
-                    return;
+                else if (event.keyCode === 39 /* ArrowRight */ || event.keyCode === 40 /* ArrowDown */) { //&& selection.focusOffset === selection.focusNode.textContent.length
+                    if (actElm.innerText.length === selection.getRangeAt(0).endOffset && activeIndex < spanElms.length - 1) {
+                        activeIndex = activeIndex + 1;
+                    }
                 }
-                actElm.classList.remove('activeSpanElm');
+                if (activeIndex !== -1 && spanElms.indexOf(actElm) !== activeIndex)
+                    actElm.classList.remove('activeSpanElm');
             }
-            if (activeIndex !== null && activeIndex !== -1 && activeIndex && spanElms[activeIndex]) {
-                range.selectNodeContents(spanElms[activeIndex]); // Select the entire content of the element
-                range.collapse(false);
-                const selection = window.getSelection();
-                selection.removeAllRanges();
-                selection.addRange(range);
-                setContentEditableCursorIndex(range.startOffset);
+            if (activeIndex !== null && activeIndex !== -1 && spanElms.length > activeIndex && spanElms.indexOf(actElm) !== activeIndex) {
+                if (event.keyCode === 37 /* ArrowLeft */ || event.keyCode === 38 /* ArrowUp */)
+                    range.selectNodeContents(spanElms[activeIndex]);
+                else if (event.keyCode === 39 /* ArrowRight */ || event.keyCode === 40)
+                    range.setStart(spanElms[activeIndex], 0);
                 if (!range.startContainer.parentElement.getAttribute('id')) {
                     range.startContainer.parentElement.classList.add('activeSpanElm');
                 }
@@ -204,6 +210,9 @@ const FormulaComponent = (props) => {
                     eml === null || eml === void 0 ? void 0 : eml.classList.add('activeSpanElm');
                 }
             }
+            let CurrentActElm = document.querySelector('.formulaSpanElm.activeSpanElm');
+            if (CurrentActElm)
+                getCursorPosition(CurrentActElm);
         }
         // Allow numbers, *, -, +, %, /, (, ), and single space
         if (!((event.keyCode >= '0' && event.keyCode <= '9') ||
@@ -253,15 +262,15 @@ const FormulaComponent = (props) => {
         }
     };
     const onAddOperator = (event, operator) => {
-        var _a, _b;
         let elm = document.querySelector('.activeSpanElm');
-        const operators = ['%', '*', '-', '+', '/'];
-        const lastChar = (_a = elm.innerHTML) === null || _a === void 0 ? void 0 : _a.charAt(((_b = elm.innerHTML) === null || _b === void 0 ? void 0 : _b.length) - 1);
-        // Prevent entering operators coonChangeCondition(str);ntinuously after each other
-        if (lastChar && operators.includes(lastChar)) {
-            event.preventDefault();
-            return;
-        }
+        console.log(event);
+        // const operators = ['%', '*', '-', '+', '/'];
+        // const lastChar = elm.innerHTML?.charAt(elm.innerHTML?.length - 1);
+        // // Prevent entering operators coonChangeCondition(str);ntinuously after each other
+        // if (lastChar && operators.includes(lastChar) && operators.includes(operator)) {
+        //     event.preventDefault();
+        //     return;
+        // }
         if (contentEditableDivRef.current.innerHTML !== `<span class='formulaSpanElm'></span>`) {
             elm.innerHTML = elm.innerHTML + operator;
         }
@@ -372,8 +381,8 @@ const FormulaComponent = (props) => {
                         if (z === 0 && (splitText.length - 1) === i && chipElm)
                             formulatText = textParts[z] ? formulatText + `<span class='formulaSpanElm'>${textParts[z]}</span>` + chipElm + `<span class='formulaSpanElm'></span>` : `<span class='formulaSpanElm'></span>`;
                         else if (z === 0 && chipElm && id) {
-                            let lastSpanIndex = formulatText.lastIndexOf('</span>');
-                            formulatText = textParts[z] ? formulatText.slice(0, lastSpanIndex) + `${textParts[z]}</span>` + chipElm : `<span class='formulaSpanElm'></span>`;
+                            // let lastSpanIndex = formulatText.lastIndexOf('</span>');
+                            formulatText = textParts[z] ? formulatText + `<span class='formulaSpanElm'>${textParts[z]}</span>` + chipElm : `<span class='formulaSpanElm'></span>`;
                         }
                         else
                             formulatText = textParts[z] ? formulatText + `<span class='formulaSpanElm'>${textParts[z]}</span>` : `<span class='formulaSpanElm'></span>`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sccoreui",
-  "version": "5.9.3",
+  "version": "5.9.4",
   "description": "ui-sccore",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/dist/components/ag-grid/advancedFeature/new-filter/TableFilter.module.scss

@@ -1,4 +0,0 @@
-.condition_button {
-    height: 40px !important;
-    width: 64px !important;
-}

package/dist/components/ag-grid/ag-grid.scss

@@ -1,61 +0,0 @@
-.ag-grid-container {
-  .ag-root-wrapper {
-    &.ag-layout-normal {
-      border: 0;
-    }
-  }
-}
-
-.ag-header {
-  background: var(--gray-50);
-
-  border-top: 1px solid var(--gray-300);
-  border-bottom: 1px solid var(--gray-200) !important;
-}
-
-.ag-root-wrapper {
-  border-radius: 6px !important;
-  border-top-left-radius: 0px !important;
-}
-
-.ag-ltr .ag-cell-focus:not(.ag-cell-range-selected):focus-within {
-  border: 0;
-  border-color: initial;
-}
-
-.ag-ltr .ag-cell {
-  display: flex;
-  align-items: center;
-}
-
-.ag-grid-container {
-  border: 1px solid var(--gray-200) !important;
-  background: #fff !important;
-}
-
-// .ag-ltr .ag-header-cell-resize {
-//   display: none;
-// }
-
-.ag-row {
-  border-bottom: 1px solid var(--gray-200);
-}
-
-.ag-row-odd {
-  background-color: var(--gray-25);
-}
-
-.ag-row {
-  &:focus {
-    background-color: var(--gray-100);
-  }
-}
-
-.ag-theme-quartz {
-  --ag-active-color: var(--gray-300);
-}
-
-.ag-ltr .ag-header-viewport .ag-header-cell-resize::after {
-  background-color: var(--gray-200);
-  width: 1px;
-}