Skip to content

3253 - fix input datapill icons #3303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kresimir-coko merged 1 commit into from
Oct 17, 2025
Merged

3253 - fix input datapill icons #3303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 11 additions & 42 deletions .../components/properties/components/property-mentions-input/PropertyMentionsInputEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,8 @@ import {Editor, EditorContent, Extension, mergeAttributes, useEditor} from '@tip
import {StarterKit} from '@tiptap/starter-kit';
import {decode} from 'html-entities';
import resolvePath from 'object-resolve-path';
import {
ForwardedRef,
MutableRefObject,
ReactElement,
forwardRef,
useCallback,
useEffect,
useMemo,
useState,
} from 'react';
import {ForwardedRef, MutableRefObject, forwardRef, useCallback, useEffect, useMemo, useState} from 'react';
import {renderToStaticMarkup} from 'react-dom/server';
import sanitizeHtml from 'sanitize-html';
import {twMerge} from 'tailwind-merge';
import {useDebouncedCallback} from 'use-debounce';
Expand All @@ -46,9 +38,6 @@ import {useShallow} from 'zustand/shallow';
import {FormulaMode} from './FormulaMode.extension';
import {MentionStorage} from './MentionStorage.extension';

const defaultIcon =
'<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M16 3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V8Z"/><path d="M15 3v4a2 2 0 0 0 2 2h4"/></svg>';

interface PropertyMentionsInputEditorProps {
className?: string;
componentDefinitions: ComponentDefinitionBasic[];
Expand Down Expand Up @@ -91,9 +80,6 @@ const PropertyMentionsInputEditor = forwardRef<Editor, PropertyMentionsInputEdit
const [editorValue, setEditorValue] = useState<string | number | undefined>(value);
const [isLocalUpdate, setIsLocalUpdate] = useState(false);
const [mentionOccurences, setMentionOccurences] = useState(0);
const [renderToStaticMarkup, setRenderToStaticMarkup] = useState<((element: ReactElement) => string) | null>(
null
);

const currentNode = useWorkflowNodeDetailsPanelStore((state) => state.currentNode);

Expand All @@ -105,31 +91,21 @@ const PropertyMentionsInputEditor = forwardRef<Editor, PropertyMentionsInputEdit
componentName = workflow.workflowTriggerComponentNames?.[0] || '';
}

const upperCaseComponentName = componentName.toUpperCase();

if (Object.keys(TYPE_ICONS).includes(upperCaseComponentName)) {
const reactIcon = TYPE_ICONS[upperCaseComponentName as keyof typeof TYPE_ICONS];
if (TASK_DISPATCHER_NAMES.includes(componentName)) {
return taskDispatcherDefinitions.find((component) => component.name === componentName)?.icon;
}

const svgString = renderToStaticMarkup ? renderToStaticMarkup(reactIcon) : '';
const componentIcon = componentDefinitions.find((component) => component.name === componentName)?.icon;

return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgString)}`;
if (componentIcon) {
return componentIcon;
}

if (TASK_DISPATCHER_NAMES.includes(componentName)) {
return (
taskDispatcherDefinitions.find((component) => component.name === componentName)?.icon ||
defaultIcon
);
}
const svgString = renderToStaticMarkup(TYPE_ICONS.STRING);

return componentDefinitions.find((component) => component.name === componentName)?.icon || defaultIcon;
return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgString)}`;
},
[
componentDefinitions,
renderToStaticMarkup,
taskDispatcherDefinitions,
workflow.workflowTriggerComponentNames,
]
[componentDefinitions, taskDispatcherDefinitions, workflow.workflowTriggerComponentNames]
);

const {updateClusterElementParameterMutation, updateWorkflowNodeParameterMutation} = useWorkflowEditor();
Expand Down Expand Up @@ -430,13 +406,6 @@ const PropertyMentionsInputEditor = forwardRef<Editor, PropertyMentionsInputEdit
(ref as MutableRefObject<Editor | null>).current = editor;
}

// Load the function when component mounts
useEffect(() => {
import('react-dom/server').then(({renderToStaticMarkup}) => {
setRenderToStaticMarkup(() => renderToStaticMarkup);
});
}, []);

useEffect(() => {
if (editor) {
editor.storage.MentionStorage.dataPills = dataPills;
Expand Down
Loading