Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,13 @@
<Label label={isDiffShown ? ui.string.ShowLess : ui.string.ShowMore} />
</div>
{#if isDiffShown}
<svelte:component this={attributeModel.presenter} value={values[0]} {prevValue} showOnlyDiff />
<svelte:component
this={attributeModel.presenter}
attribute={attributeModel.attribute}
value={values[0]}
{prevValue}
showOnlyDiff
/>
{/if}
{/if}
{:else}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,20 @@
//
-->
<script lang="ts">
import { Class, Doc, Ref } from '@hcengineering/core'
import { MarkupNode, ReferenceNode, jsonToPmNode } from '@hcengineering/text'
import { Editor, Extension, mergeAttributes } from '@tiptap/core'
import { Plugin, PluginKey } from '@tiptap/pm/state'
import { DecorationSet } from '@tiptap/pm/view'
import { onDestroy, onMount } from 'svelte'
import { MarkupNode, ReferenceNode, jsonToPmNode } from '@hcengineering/text'

import { calculateDecorations } from './diff/decorations'
import { defaultEditorAttributes } from './editor/editorProps'
import { getEditorKit } from '../../src/kits/editor-kit'

export let content: MarkupNode
export let comparedVersion: MarkupNode | undefined = undefined
export let objectClass: Ref<Class<Doc>> | undefined = undefined

let element: HTMLElement
let editor: Editor
Expand Down Expand Up @@ -79,7 +81,13 @@
element,
content,
editable: false,
extensions: [await getEditorKit(), ReferenceNode, DecorationExtension],
extensions: [
(await getEditorKit()).configure({
objectClass
}),
ReferenceNode,
DecorationExtension
],
onTransaction: () => {
// force re-render so `editor.isActive` works as expected
editor = editor
Expand Down
21 changes: 5 additions & 16 deletions plugins/time-resources/src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { WorkSlot, ToDo } from '@hcengineering/time'
import type { DefSeparators } from '@hcengineering/ui'
import core, { type Class, type Client, type Doc, type Ref, type Space } from '@hcengineering/core'
import core, { type Class, type Client, type Doc, type Ref } from '@hcengineering/core'
import time from '@hcengineering/time'
import { type TextEditorMode, type AnyExtension } from '@hcengineering/text-editor'
import { SvelteNodeViewRenderer } from '@hcengineering/text-editor-resources'
Expand Down Expand Up @@ -56,23 +56,12 @@ function isTodoableClass (objectClass: Ref<Class<Doc>>): boolean {
}
}

function isTodoable (
mode: TextEditorMode,
objectId?: Ref<Doc>,
objectClass?: Ref<Class<Doc>>,
objectSpace?: Ref<Space>
): boolean {
return (
mode === 'full' &&
objectId !== undefined &&
objectClass !== undefined &&
objectSpace !== undefined &&
isTodoableClass(objectClass)
)
function isTodoable (mode: TextEditorMode, objectClass?: Ref<Class<Doc>>): boolean {
return mode === 'full' && objectClass !== undefined && isTodoableClass(objectClass)
}

export function createTodoItemExtension (mode: TextEditorMode, ctx: any): AnyExtension | undefined {
if (!isTodoable(mode, ctx.objectId, ctx.objectClass, ctx.objectSpace)) {
if (!isTodoable(mode, ctx.objectClass)) {
return
}

Expand All @@ -95,7 +84,7 @@ export function createTodoItemExtension (mode: TextEditorMode, ctx: any): AnyExt
}

export function createTodoListExtension (mode: TextEditorMode, ctx: any): AnyExtension | undefined {
if (!isTodoable(mode, ctx.objectId, ctx.objectClass, ctx.objectSpace)) {
if (!isTodoable(mode, ctx.objectClass)) {
return
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@
// limitations under the License.
-->
<script lang="ts">
import { Markup } from '@hcengineering/core'
import { AnyAttribute, Markup } from '@hcengineering/core'
import { EmptyMarkup, MarkupNode, MarkupNodeType, markupToJSON } from '@hcengineering/text'
import { MarkupDiffViewer } from '@hcengineering/text-editor-resources'
import { ShowMore } from '@hcengineering/ui'
import { deepEqual } from 'fast-equals'

export let value: Markup | undefined
export let prevValue: Markup | undefined = undefined
export let attribute: AnyAttribute | undefined = undefined

export let showOnlyDiff: boolean = false

Expand Down Expand Up @@ -86,6 +87,6 @@

<ShowMore>
{#key [value, prevValue]}
<MarkupDiffViewer {content} {comparedVersion} />
<MarkupDiffViewer objectClass={attribute?.attributeOf} {content} {comparedVersion} />
{/key}
</ShowMore>