@antscorp/antsomi-ui 1.3.7-beta.32 → 1.3.7-beta.34

package/es/components/organism/SQLGeneration/index.scss

@@ -1 +1 @@
-@use './integrations/AceEditor';
+@use './integrations/AceEditor';

package/es/components/organism/SQLGeneration/integrations/AceEditor/index.scss

@@ -1,4 +1,4 @@
-.ace-sqlgen-placeholder {
-  display: inline-block;
-  cursor: pointer;
-}
+.ace-sqlgen-placeholder {
+  display: inline-block;
+  cursor: pointer;
+}

package/es/components/organism/Table/CrossTabTable/components/CustomCell/styled.js

@@ -1,13 +1,13 @@
 import styled from 'styled-components';
-export const BarCell = styled.div `
-  position: absolute;
-  inset: 0;
-  background-color: rgba(0, 0, 0, 0.075);
-
-  .bar-line {
-    position: absolute;
-    bottom: 0;
-    height: 3px;
-    width: 100%;
-  }
+export const BarCell = styled.div `
+  position: absolute;
+  inset: 0;
+  background-color: rgba(0, 0, 0, 0.075);
+
+  .bar-line {
+    position: absolute;
+    bottom: 0;
+    height: 3px;
+    width: 100%;
+  }
 `;

package/es/components/organism/Table/CrossTabTable/styled.js

@@ -1,13 +1,13 @@
 import styled from 'styled-components';
-export const BarCell = styled.div `
-  position: absolute;
-  inset: 0;
-  background-color: rgba(0, 0, 0, 0.075);
-
-  .bar-line {
-    position: absolute;
-    bottom: 0;
-    height: 3px;
-    width: 100%;
-  }
+export const BarCell = styled.div `
+  position: absolute;
+  inset: 0;
+  background-color: rgba(0, 0, 0, 0.075);
+
+  .bar-line {
+    position: absolute;
+    bottom: 0;
+    height: 3px;
+    width: 100%;
+  }
 `;

package/es/components/organism/Table/ExplorePivotTable/components/CustomCell/styled.js

@@ -1,21 +1,21 @@
 import styled from 'styled-components';
-export const BarCell = styled.div `
-  position: absolute;
-  inset: 0;
-  background-color: rgba(0, 0, 0, 0.075);
-
-  .bar-line {
-    position: absolute;
-    bottom: 0;
-    height: 3px;
-    width: 100%;
-  }
+export const BarCell = styled.div `
+  position: absolute;
+  inset: 0;
+  background-color: rgba(0, 0, 0, 0.075);
+
+  .bar-line {
+    position: absolute;
+    bottom: 0;
+    height: 3px;
+    width: 100%;
+  }
 `;
-export const HeatCell = styled.div `
-  position: absolute;
-  inset: 0;
+export const HeatCell = styled.div `
+  position: absolute;
+  inset: 0;
 `;
-export const StyledValue = styled.div `
-  position: relative;
-  z-index: 1;
+export const StyledValue = styled.div `
+  position: relative;
+  z-index: 1;
 `;

package/es/components/organism/Table/ExplorePivotTable/styled.js

@@ -1,15 +1,15 @@
 import styled from 'styled-components';
 import { Table } from '../Table';
-export const StyledTable = styled(Table) `
-  .antsomi-table-thead {
-    .antsomi-table-cell {
-      background-color: white !important;
-      font-weight: 400 !important;
-    }
-  }
+export const StyledTable = styled(Table) `
+  .antsomi-table-thead {
+    .antsomi-table-cell {
+      background-color: white !important;
+      font-weight: 400 !important;
+    }
+  }
 `;
-export const StyledHeader = styled.div `
-  background-color: #4285f4;
-  padding: 8px 10px;
-  text-align: right;
+export const StyledHeader = styled.div `
+  background-color: #4285f4;
+  padding: 8px 10px;
+  text-align: right;
 `;

package/es/components/organism/TextEditor/TextEditor.js

@@ -106,7 +106,7 @@ const TextEditorInternal = memo(forwardRef((props, ref) => {
                 bulletList: false,
                 orderedList: false,
                 listItem: false,
-                undoRedo: {
+                undoRedo: config?.UndoRedo ?? {
                     depth: 100,
                 },
             }),
@@ -308,6 +308,7 @@ const TextEditorInternal = memo(forwardRef((props, ref) => {
         deleteSmartTag: handleDeleteSmartTag,
         updateSmartTagAttrs: handleUpdateSmartTagAttrs,
         blur: handleBlur,
+        setContent: editor.commands.setContent,
         style: contentRef.current?.style,
     }));
     if (!editor) {
@@ -387,6 +388,9 @@ const TextEditorWithProvider = forwardRef((props, ref) => {
         get blur() {
             return editorRef.current.blur;
         },
+        get setContent() {
+            return editorRef.current.setContent;
+        },
         // Forward TextEditorProviderRefHandler methods
         updateColors: colors => providerRef.current?.updateColors?.(colors),
     }), []);

package/es/components/organism/TextEditor/__mocks__/text-contennt.js

@@ -1,47 +1,47 @@
 import SETTINGS from './text-block.settings.json';
-const CONTENT_WITH_INHERITED_STYLES = `
-    <div class="fr-box" role="application">
-      <div class="fr-wrapper" dir="auto">
-        <div class="fr-element fr-view" dir="auto" contenteditable="true" aria-disabled="false" spellcheck="true">
-          <p style="text-align: center;">
-            <span style="font-family: Montserrat; font-size: 22px; letter-spacing: 0px; color: rgb(0, 0, 0);">
-              <span id="isPasted" style="font-weight: 800; font-size: 34px; line-height: inherit; font-family: Montserrat; letter-spacing: 0px; text-align: center; text-transform: none; color: rgb(77, 96, 116);">Receive&nbsp;</span>
-              <span style="font-weight: 400; font-size: 34px; line-height: inherit; font-family: Montserrat; color: rgb(0, 0, 0); letter-spacing: normal; text-align: center; text-transform: none;">
-                <span style="font-weight: 800; font-size: inherit; line-height: inherit; font-family: Montserrat; letter-spacing: 0px; color: rgb(255, 79, 66);"><u>10% Off</u></span>
-              </span>
-              <span style="font-weight: 800; font-size: 34px; line-height: inherit; font-family: Montserrat; letter-spacing: 0px; text-align: center; text-transform: none; color: rgb(77, 96, 116);">&nbsp;Your First Order!</span>
-            </span>
-          </p>
-        </div>
-        <span class="fr-placeholder" style="font-size: 12px; line-height: 12px; margin-top: 0px; padding-top: 0px; padding-left: 0px; margin-left: 0px; padding-right: 0px; margin-right: 0px; text-align: left;">Enter your text here</span>
-      </div>
-    </div>
+const CONTENT_WITH_INHERITED_STYLES = `
+    <div class="fr-box" role="application">
+      <div class="fr-wrapper" dir="auto">
+        <div class="fr-element fr-view" dir="auto" contenteditable="true" aria-disabled="false" spellcheck="true">
+          <p style="text-align: center;">
+            <span style="font-family: Montserrat; font-size: 22px; letter-spacing: 0px; color: rgb(0, 0, 0);">
+              <span id="isPasted" style="font-weight: 800; font-size: 34px; line-height: inherit; font-family: Montserrat; letter-spacing: 0px; text-align: center; text-transform: none; color: rgb(77, 96, 116);">Receive&nbsp;</span>
+              <span style="font-weight: 400; font-size: 34px; line-height: inherit; font-family: Montserrat; color: rgb(0, 0, 0); letter-spacing: normal; text-align: center; text-transform: none;">
+                <span style="font-weight: 800; font-size: inherit; line-height: inherit; font-family: Montserrat; letter-spacing: 0px; color: rgb(255, 79, 66);"><u>10% Off</u></span>
+              </span>
+              <span style="font-weight: 800; font-size: 34px; line-height: inherit; font-family: Montserrat; letter-spacing: 0px; text-align: center; text-transform: none; color: rgb(77, 96, 116);">&nbsp;Your First Order!</span>
+            </span>
+          </p>
+        </div>
+        <span class="fr-placeholder" style="font-size: 12px; line-height: 12px; margin-top: 0px; padding-top: 0px; padding-left: 0px; margin-left: 0px; padding-right: 0px; margin-right: 0px; text-align: left;">Enter your text here</span>
+      </div>
+    </div>
 `;
-export const HTML_DOM = `<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>Raw HTML</title>
-  </head>
-  <body>
-    <p><span style="line-height: 100%;"><span style="font-family: Arial, sans-serif; font-size: 14px; letter-spacing: 0px;">Dear </span><span style="font-family: Arial, sans-serif; font-size: 14px; letter-spacing: 0px; font-weight: 600; color: rgb(85, 85, 85);"><span data-dynamic="true" data-dynamic-id="zfs1gvrr" style="direction: unset; unicode-bidi: bidi-override; text-align: right; background-color: rgba(0, 199, 97, 0.2);">Email</span></span><span style="font-family: Arial, sans-serif; font-size: 14px; letter-spacing: 0px;">,</span></span></p>
-    <p><span style="font-size: 14px;"><br></span></p>
-    <p></p>
-    <p><span style="font-family: Arial, sans-serif; font-size: 14px; line-height: 100%; letter-spacing: 0px;">Here's a roundup of our top health and fitness stories from the past two weeks.</span></p>
-
-    <p><span style="font-family: Arial, sans-serif; font-size: 16px; line-height: 100%; letter-spacing: 0px;">Your Special Bonus Offer Has Been Unlocked</span></p>
-    <p><br></p>
-    <p><br></p>
-    <p><br></p>
-    <p><br></p>
-    <p><br></p>
-    <p><br></p>
-    <p><span style="font-family: Arial, sans-serif; font-size: 16px; line-height: 100%; letter-spacing: 0px;">fasdfasdf</span></p>
-
-    ${SETTINGS.settings.rawHTML}
-
-    ${CONTENT_WITH_INHERITED_STYLES}
-  </body>
-</html>
+export const HTML_DOM = `<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Raw HTML</title>
+  </head>
+  <body>
+    <p><span style="line-height: 100%;"><span style="font-family: Arial, sans-serif; font-size: 14px; letter-spacing: 0px;">Dear </span><span style="font-family: Arial, sans-serif; font-size: 14px; letter-spacing: 0px; font-weight: 600; color: rgb(85, 85, 85);"><span data-dynamic="true" data-dynamic-id="zfs1gvrr" style="direction: unset; unicode-bidi: bidi-override; text-align: right; background-color: rgba(0, 199, 97, 0.2);">Email</span></span><span style="font-family: Arial, sans-serif; font-size: 14px; letter-spacing: 0px;">,</span></span></p>
+    <p><span style="font-size: 14px;"><br></span></p>
+    <p></p>
+    <p><span style="font-family: Arial, sans-serif; font-size: 14px; line-height: 100%; letter-spacing: 0px;">Here's a roundup of our top health and fitness stories from the past two weeks.</span></p>
+
+    <p><span style="font-family: Arial, sans-serif; font-size: 16px; line-height: 100%; letter-spacing: 0px;">Your Special Bonus Offer Has Been Unlocked</span></p>
+    <p><br></p>
+    <p><br></p>
+    <p><br></p>
+    <p><br></p>
+    <p><br></p>
+    <p><br></p>
+    <p><span style="font-family: Arial, sans-serif; font-size: 16px; line-height: 100%; letter-spacing: 0px;">fasdfasdf</span></p>
+
+    ${SETTINGS.settings.rawHTML}
+
+    ${CONTENT_WITH_INHERITED_STYLES}
+  </body>
+</html>
 `;

package/es/components/organism/TextEditor/extensions/Link.js

@@ -40,22 +40,41 @@ export const CustomLink = TiptapLinkExtension.extend({
             setCustomLink: ({ attrs, content }) => ({ state, chain }) => {
                 const { selection } = state;
                 const { from, to } = selection;
-                let linkContent = textBetween(state, from, to);
-                if (content && linkContent !== content) {
-                    linkContent = content;
+                // Check if custom content is provided and different from current text
+                const currentText = textBetween(state, from, to);
+                const shouldUseCustomContent = content && currentText !== content;
+                if (shouldUseCustomContent) {
+                    // Use custom content as string (replace content)
+                    return chain()
+                        .focus()
+                        .deleteSelection()
+                        .insertContent(content)
+                        .command(({ tr }) => {
+                        const endPos = tr.selection.from;
+                        const startPos = endPos - content.length;
+                        tr.setSelection(TextSelection.create(tr.doc, startPos, endPos));
+                        return true;
+                    })
+                        .setLink({
+                        ...attrs,
+                        href: attrs?.href || './',
+                    })
+                        .command(({ tr }) => {
+                        const endPos = tr.selection.to;
+                        tr.setSelection(TextSelection.create(tr.doc, endPos, endPos));
+                        return true;
+                    })
+                        .run();
                 }
-                return (chain()
+                // Preserve existing content structure (atom nodes like smartTag)
+                // Just apply link mark on current selection without modifying content
+                return chain()
                     .focus()
-                    .deleteSelection()
-                    .insertContent(linkContent)
                     .command(({ tr }) => {
-                    const endPos = tr.selection.from;
-                    const startPos = endPos - linkContent.length;
-                    tr.setSelection(TextSelection.create(tr.doc, startPos, endPos));
+                    // Ensure selection is set correctly
+                    tr.setSelection(TextSelection.create(tr.doc, from, to));
                     return true;
                 })
-                    // .setUnderline()
-                    // .setColor(LINK_TEXT_COLOR)
                     .setLink({
                     ...attrs,
                     href: attrs?.href || './',
@@ -65,7 +84,7 @@ export const CustomLink = TiptapLinkExtension.extend({
                     tr.setSelection(TextSelection.create(tr.doc, endPos, endPos));
                     return true;
                 })
-                    .run());
+                    .run();
             },
             deleteCustomLink: predicate => ({ state, chain }) => {
                 const { doc } = state;

package/es/components/organism/TextEditor/extensions/SmartTag.js

@@ -1,4 +1,4 @@
-import { Node, mergeAttributes } from '@tiptap/core';
+import { Node, getMarksBetween, mergeAttributes } from '@tiptap/core';
 import { Plugin, PluginKey } from '@tiptap/pm/state';
 import uniqid from 'uniqid';
 import { isSmartTagNode } from '../types';
@@ -66,10 +66,10 @@ export const SmartTag = Node.create({
     addCommands() {
         return {
             setSmartTag: attrs => ({ chain, state }) => {
-                const { selection, storedMarks } = state;
-                const { $from, from, to } = selection;
+                const { selection } = state;
+                const { from, to } = selection;
                 // Get marks from inside the selection to capture boundary marks
-                const marks = storedMarks || (from !== to ? state.doc.resolve(from + 1).marks() : $from.marks());
+                const marks = getMarksBetween(from, to, state.doc).map(markRange => markRange.mark);
                 const smartTagNode = this.type.create(attrs);
                 const nodeWithMarks = marks.length > 0 ? smartTagNode.mark(marks) : smartTagNode;
                 return chain()

package/es/components/organism/TextEditor/index.scss

@@ -1,65 +1,65 @@
-.antsomi-text-editor-bubble-menu {
-  visibility: hidden;
-  position: absolute;
-  pointer-events: auto;
-  z-index: 999;
-  background-color: white;
-  border-radius: 4px;
-  padding: 15px;
-  box-shadow: var(--antsomi-box-shadow-secondary);
-}
-
-.antsomi-text-editor-emoji-popover {
-  position: absolute;
-  width: 180px;
-  z-index: 1000;
-
-  .antsomi-text-editor-emoji-list {
-    .antsomi-virtualize-menu-menu-inline {
-      background-color: white;
-      box-shadow: var(--antsomi-box-shadow-secondary);
-      border-radius: 10px;
-
-      .antsomi-virtualize-menu-item-label {
-        display: flex;
-        align-items: center;
-        gap: 10px;
-      }
-    }
-  }
-}
-
-.font-popover-overlay {
-  padding: 0;
-
-  .font-popover-item {
-    width: 100%;
-    height: 100%;
-    cursor: pointer;
-    padding-left: 10px;
-    padding-right: 8px;
-
-    &:hover,
-    &.active {
-      background-color: #f2f9ff;
-    }
-  }
-}
-
-.font-weight-popover {
-  &.antsomi-popover {
-    .antsomi-popover-inner {
-      padding: 10px 0px;
-
-      .font-weight-item {
-        padding: 4px 10px;
-        cursor: pointer;
-
-        &:hover,
-        &.active {
-          background-color: #f2f9ff;
-        }
-      }
-    }
-  }
-}
+.antsomi-text-editor-bubble-menu {
+  visibility: hidden;
+  position: absolute;
+  pointer-events: auto;
+  z-index: 999;
+  background-color: white;
+  border-radius: 4px;
+  padding: 15px;
+  box-shadow: var(--antsomi-box-shadow-secondary);
+}
+
+.antsomi-text-editor-emoji-popover {
+  position: absolute;
+  width: 180px;
+  z-index: 1000;
+
+  .antsomi-text-editor-emoji-list {
+    .antsomi-virtualize-menu-menu-inline {
+      background-color: white;
+      box-shadow: var(--antsomi-box-shadow-secondary);
+      border-radius: 10px;
+
+      .antsomi-virtualize-menu-item-label {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+      }
+    }
+  }
+}
+
+.font-popover-overlay {
+  padding: 0;
+
+  .font-popover-item {
+    width: 100%;
+    height: 100%;
+    cursor: pointer;
+    padding-left: 10px;
+    padding-right: 8px;
+
+    &:hover,
+    &.active {
+      background-color: #f2f9ff;
+    }
+  }
+}
+
+.font-weight-popover {
+  &.antsomi-popover {
+    .antsomi-popover-inner {
+      padding: 10px 0px;
+
+      .font-weight-item {
+        padding: 4px 10px;
+        cursor: pointer;
+
+        &:hover,
+        &.active {
+          background-color: #f2f9ff;
+        }
+      }
+    }
+  }
+}