diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 448b34b8f0..e8d4c7c1da 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -19096,6 +19096,12 @@ importers: '@hcengineering/presentation': specifier: workspace:^0.7.0 version: link:../../packages/presentation + '@hcengineering/text': + specifier: workspace:^0.7.19 + version: link:../../foundations/core/packages/text + '@hcengineering/text-markdown': + specifier: workspace:^0.7.21 + version: link:../../foundations/core/packages/text-markdown '@hcengineering/theme': specifier: workspace:^0.7.0 version: link:../../packages/theme @@ -61587,7 +61593,7 @@ snapshots: node-loader@2.0.0(webpack@5.102.1): dependencies: loader-utils: 2.0.4 - webpack: 5.102.1 + webpack: 5.102.1(esbuild@0.25.12)(webpack-cli@5.1.4) node-localstorage@2.2.1: dependencies: diff --git a/plugins/card-resources/src/components/MarkupProperties.svelte b/plugins/card-resources/src/components/MarkupProperties.svelte index d36febf002..e2c3ddd382 100644 --- a/plugins/card-resources/src/components/MarkupProperties.svelte +++ b/plugins/card-resources/src/components/MarkupProperties.svelte @@ -33,7 +33,6 @@ const hierarchy = client.getHierarchy() function updateKeys (_class: Ref>, to: Ref> | undefined): void { - console.log('tag', _class, to) const filtredKeys = [...hierarchy.getAllAttributes(_class, to).entries()] .filter(([key, value]) => value.hidden !== true && value.type._class === core.class.TypeMarkup) .map(([key, attr]) => ({ key, attr })) diff --git a/plugins/card-resources/src/components/sections/MarkupPropertiesSection.svelte b/plugins/card-resources/src/components/sections/MarkupPropertiesSection.svelte index 404938e4dd..c0221ca5b3 100644 --- a/plugins/card-resources/src/components/sections/MarkupPropertiesSection.svelte +++ b/plugins/card-resources/src/components/sections/MarkupPropertiesSection.svelte @@ -16,6 +16,7 @@ @@ -44,7 +46,7 @@ height={value ? 'auto' : undefined} on:click={(ev) => { if (!shown && !readonly) { - showPopup(MarkupEditorPopup, { value }, eventToHTMLElement(ev), (res) => { + showPopup(MarkupEditorPopup, { value, kitOptions }, eventToHTMLElement(ev), (res) => { if (res != null) { value = res onChange(value) @@ -69,6 +71,7 @@ content={value} {placeholder} alwaysEdit + {kitOptions} mode={2} on:value={(e) => { onChange(e.detail) diff --git a/plugins/view-resources/src/components/MarkupEditorPopup.svelte b/plugins/view-resources/src/components/MarkupEditorPopup.svelte index fa966e2acd..185a7a1987 100644 --- a/plugins/view-resources/src/components/MarkupEditorPopup.svelte +++ b/plugins/view-resources/src/components/MarkupEditorPopup.svelte @@ -16,10 +16,12 @@