Merge pull request #85 from Darginec05/82-selecting-list-item-shows-w…

…rong-element-type

82 selecting list item shows wrong element type

packages/yoopta-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yoopta/editor",
-  "version": "1.9.22-rc",
+  "version": "1.9.24-rc",
   "license": "MIT",
   "private": false,
   "type": "module",

packages/yoopta-editor/src/contexts/YooptaContext/YooptaContext.tsx

@@ -1,12 +1,11 @@
 import { Editor, Element, NodeEntry, Path, Text, Transforms } from 'slate';
 import React, { ReactElement, ReactNode, useContext, useMemo, useRef } from 'react';
 import { useSlate } from 'slate-react';
-import { YooptaBaseElement } from '../../types';
-import { ParentYooptaPlugin, YooptaPluginType } from '../../utils/plugins';
+import { YooptaBaseElement, YooptaTools } from '../../types';
+import { YooptaPluginType } from '../../utils/plugins';
 import { YooptaMark } from '../../utils/marks';
 import { getDefaultParagraphLine } from '../../components/Editor/utils';
 import { generateId } from '../../utils/generateId';
-import { YooptaTools } from '../../components/YooptaEditor/YooptaEditor';
 
 const defaultValues: YooptaContextReturnValues = { marks: {}, elements: {} };
 
@@ -34,7 +33,7 @@ export type YooptaContextType = YooptaContextReturnValues;
 
 type Props = {
   children: ReactNode;
-  plugins: ParentYooptaPlugin[];
+  plugins: Omit<YooptaPluginType, 'childPlugin'>[];
   marks?: YooptaMark[];
   tools?: YooptaTools | undefined;
 };
@@ -115,7 +114,7 @@ const YooptaContextProvider = ({ children, plugins: pluginList, marks: markList,
 
     const [element] = Editor.nodes(editor, {
       at: Editor.unhangRange(editor, editor.selection),
-      match: (n) => !Editor.isEditor(n) && Element.isElement(n) && n.type === type,
+      match: (n) => !Editor.isEditor(n) && Element.isElement(n) && !Editor.isInline(editor, n) && n.type === type,
       mode: 'highest',
     });
 
@@ -127,13 +126,13 @@ const YooptaContextProvider = ({ children, plugins: pluginList, marks: markList,
     const ELEMENTS_MAP: ElementsMap = {};
 
     pluginList.forEach((plugin) => {
-      const { createElement, defineElement, type, options, ...rest } = plugin;
+      const { createElement, defineElement, type, options, hasParent } = plugin;
       ELEMENTS_MAP[plugin.type] = {
         create: createElement,
         define: defineElement,
         toggle: (options) => toggleNodeElement(plugin, options),
         type,
-        isActive: isElementActive(type),
+        isActive: !hasParent && isElementActive(type),
         options: { displayLabel: options?.displayLabel },
       };
     });

web/package.json

@@ -20,7 +20,7 @@
     "@yoopta/callout": "^1.9.15-rc",
     "@yoopta/chat-gpt-assistant": "^1.9.16-rc",
     "@yoopta/code": "^1.9.15-rc",
-    "@yoopta/editor": "^1.9.22-rc",
+    "@yoopta/editor": "^1.9.24-rc",
     "@yoopta/embed": "^1.9.18-rc",
     "@yoopta/exports": "^1.9.17-rc",
     "@yoopta/headings": "^1.9.15-rc",

web/yarn.lock

@@ -1615,10 +1615,10 @@
     prism-material-themes "^1.0.4"
     prismjs "^1.29.0"
 
-"@yoopta/editor@^1.9.22-rc":
-  version "1.9.22-rc"
-  resolved "https://registry.yarnpkg.com/@yoopta/editor/-/editor-1.9.22-rc.tgz#3074393d3c3f316658c706c9492d207ba1e8632a"
-  integrity sha512-pnQsS7kT2ux++4QaS+rJ34ZOOqmRXq/drJsSI69t6rhjXS5jSWwRoNeiCeK0STJM3bz348hWs3UPRm35qXrwdQ==
+"@yoopta/editor@^1.9.23-rc":
+  version "1.9.23-rc"
+  resolved "https://registry.yarnpkg.com/@yoopta/editor/-/editor-1.9.23-rc.tgz#aa6f829149a3225d56c2031d21f6c94fc5e4c950"
+  integrity sha512-+ms9OVWUoio8taYfwe9CaMeKjvQfupwFroVuIUqaXIh6xuZSadhBe12wtuf2I2MJyWKEgifZjiPQ3LrnwemV3Q==
   dependencies:
     body-scroll-lock "^4.0.0-beta.0"
     classnames "^2.3.1"