tycho-components 0.2.4-SNAPSHOT-4 → 0.2.4-SNAPSHOT-6

package/dist/TreeView/TreeView.d.ts

@@ -9,9 +9,10 @@ type Props = {
     wheelSensitivity?: number;
     renderWithInfo?: boolean;
     placeholder?: string;
+    cyRef?: React.MutableRefObject<Core | null>;
     onClickExpression?: () => void;
-    onExpand?: (reset: () => void) => void;
+    onExpand?: () => void;
     onReadyCustom?: (thisCy: Core) => void;
 };
-export default function TreeView({ struct, expression, selector, translations, wheelSensitivity, renderWithInfo, placeholder, onClickExpression, onExpand, onReadyCustom, }: Props): import("react/jsx-runtime").JSX.Element;
+export default function TreeView({ struct, expression, selector, translations, wheelSensitivity, renderWithInfo, placeholder, cyRef, onClickExpression, onExpand, onReadyCustom, }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/TreeView/TreeView.js

@@ -11,12 +11,11 @@ import SentenceUtils from '../functions/SentenceUtils';
 import CytoscapeTreeConverter from './cytoscape/CytoscapeTreeConverter';
 import SyntreesCytoscape from './cytoscape/SyntreesCytoscape';
 import './style.scss';
-export default function TreeView({ struct, expression, selector = 'canvas-tree', translations, wheelSensitivity, renderWithInfo = false, placeholder, onClickExpression, onExpand, onReadyCustom, }) {
+export default function TreeView({ struct, expression, selector = 'canvas-tree', translations, wheelSensitivity, renderWithInfo = false, placeholder, cyRef, onClickExpression, onExpand, onReadyCustom, }) {
     const { t } = useTranslation('tree');
     const [cy, setCy] = useState(null);
     const [showInfo, setShowInfo] = useState(renderWithInfo);
     const [invalid, setInvalid] = useState();
-    const [expandedExternally, setExpandedExternally] = useState(false);
     const load = () => {
         setCy(null);
         const element = document.getElementById(selector);
@@ -42,6 +41,8 @@ export default function TreeView({ struct, expression, selector = 'canvas-tree',
             wheelSensitivity,
             onReady: (thisCy) => {
                 setCy(thisCy);
+                if (cyRef)
+                    cyRef.current = thisCy;
                 onReadyCustom && onReadyCustom(thisCy);
                 renderWithInfo && applyInfo(thisCy, struct, true);
             },
@@ -93,28 +94,15 @@ export default function TreeView({ struct, expression, selector = 'canvas-tree',
         setShowInfo(newVal);
         applyInfo(cy, struct, newVal);
     };
-    const handleExpand = () => {
-        setExpandedExternally(true);
-        onExpand && onExpand(reset);
-    };
     useEffect(() => {
         setInvalid(undefined);
         load();
     }, [struct]);
-    useEffect(() => {
-        if (expandedExternally) {
-            const id = setTimeout(() => {
-                reset();
-                setExpandedExternally(false);
-            }, 50);
-            return () => clearTimeout(id);
-        }
-    }, [expandedExternally]);
     if (invalid) {
         return (_jsx(AppPlaceholder, { text: placeholder || t('placeholder.sentence.notparsed') }));
     }
     return (_jsxs("div", { className: "tree-view-container", children: [cy &&
-                getButtons(generateImage, reset, onClickExpression || downloadPsd, toggleInfo, handleExpand, onExpand, expression)
+                getButtons(generateImage, reset, onClickExpression || downloadPsd, toggleInfo, onExpand, expression)
                     .filter((btn) => btn.condition)
                     .map((btn, i) => {
                     const right = 12 + i * 44;
@@ -122,7 +110,7 @@ export default function TreeView({ struct, expression, selector = 'canvas-tree',
                 }), _jsx("div", { id: selector, className: "canvas-tree" }), showInfo && (_jsxs("div", { className: "info", children: [_jsx("span", { children: SentenceUtils.getAsText(struct) }), translations &&
                         Object.entries(translations).map(([k, v]) => (_jsxs("div", { className: "translation", children: [_jsxs("b", { children: [k, ":"] }), _jsx("span", { children: v })] }, k))), struct.parsed && (_jsxs("span", { className: "date", children: [t('date.parsed'), ' ', DateUtils.formatDateTime(struct.parsed, 'dd/MM/yyyy HH:mm:ss')] }))] }))] }));
 }
-const getButtons = (generateImage, reset, downloadPsd, toggleInfo, handleExpand, onExpand, expression) => [
+const getButtons = (generateImage, reset, downloadPsd, toggleInfo, onExpand, expression) => [
     {
         condition: true,
         title: 'button.download.tree',
@@ -145,7 +133,7 @@ const getButtons = (generateImage, reset, downloadPsd, toggleInfo, handleExpand,
     {
         condition: !!onExpand,
         title: 'button.expand.tree',
-        onClick: handleExpand,
+        onClick: onExpand,
         icon: faUpRightAndDownLeftFromCenter,
     },
     {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tycho-components",
   "private": false,
-  "version": "0.2.4-SNAPSHOT-4",
+  "version": "0.2.4-SNAPSHOT-6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {