Skip to content
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.

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

UBERF-7675: Remove heading text action from compact editors #6143

Merged
merged 2 commits into from
Jul 25, 2024
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
3 changes: 2 additions & 1 deletion models/text-editor/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export default mergeIds(textEditorId, textEditor, {
MoreImageActions: '' as Resource<TextActionFunction>,

IsEditableTableActive: '' as Resource<TextActionVisibleFunction>,
IsEditable: '' as Resource<TextActionVisibleFunction>
IsEditable: '' as Resource<TextActionVisibleFunction>,
IsHeadingVisible: '' as Resource<TextActionVisibleFunction>
}
})
5 changes: 3 additions & 2 deletions plugins/text-editor-resources/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import { type Resources } from '@hcengineering/platform'
import { formatLink } from './kits/default-kit'
import { isEditable } from './kits/editor-kit'
import { isEditable, isHeadingVisible } from './kits/editor-kit'
import { openTableOptions, isEditableTableActive } from './components/extension/table/table'
import { openImage, expandImage, moreImageActions } from './components/extension/imageExt'

Expand Down Expand Up @@ -87,6 +87,7 @@ export default async (): Promise<Resources> => ({
ExpandImage: expandImage,
MoreImageActions: moreImageActions,
IsEditableTableActive: isEditableTableActive,
IsEditable: isEditable
IsEditable: isEditable,
IsHeadingVisible: isHeadingVisible
}
})
7 changes: 6 additions & 1 deletion plugins/text-editor-resources/src/kits/editor-kit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import TableHeader from '@tiptap/extension-table-header'
import 'prosemirror-codemark/dist/codemark.css'
import { getBlobRef, getClient } from '@hcengineering/presentation'
import { CodeBlockExtension, codeBlockOptions, CodeExtension, codeOptions } from '@hcengineering/text'
import textEditor, { type ExtensionCreator, type TextEditorMode } from '@hcengineering/text-editor'
import textEditor, { type ActionContext, type ExtensionCreator, type TextEditorMode } from '@hcengineering/text-editor'

import { DefaultKit, type DefaultKitOptions } from './default-kit'
import { HardBreakExtension } from '../components/extension/hardBreak'
Expand Down Expand Up @@ -247,6 +247,7 @@ async function buildEditorKit (): Promise<Extension<EditorKitOptions, any>> {
element: this.options.toolbar?.element,
isHidden: this.options.toolbar?.isHidden,
ctx: {
mode,
objectId: this.options.objectId,
objectClass: this.options.objectClass,
objectSpace: this.options.objectSpace
Expand All @@ -273,3 +274,7 @@ async function buildEditorKit (): Promise<Extension<EditorKitOptions, any>> {
export async function isEditable (editor: Editor): Promise<boolean> {
return editor.isEditable
}

export async function isHeadingVisible (editor: Editor, ctx: ActionContext): Promise<boolean> {
return (await isEditable(editor)) && ctx.mode === 'full'
}
1 change: 1 addition & 0 deletions plugins/text-editor/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export type TextEditorCommand = (props: TextEditorCommandProps) => boolean
* @public
*/
export interface ActionContext {
mode: TextEditorMode
objectId?: Ref<Doc>
objectClass?: Ref<Class<Doc>>
objectSpace?: Ref<Space>
Expand Down