Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
840e165
rebase from main
oidacra May 5, 2025
2be01f4
chore(deps): Update Node.js version in configuration files to v20.19.1
oidacra Apr 25, 2025
222ae10
chore(deps): Update Node.js version in configuration files to v22.15.0
oidacra Apr 25, 2025
27f653e
chore: fix test after upgrade
oidacra Apr 25, 2025
fb86abd
test Ai postmain fix
oidacra Apr 25, 2025
13d7d9d
test rollback
oidacra Apr 25, 2025
2a503b3
test Ai postmain fix
oidacra Apr 28, 2025
537d63d
test Ai postmain fix
oidacra Apr 28, 2025
7c8ced9
test Ai postmain fix
oidacra Apr 28, 2025
1524faf
fix(postman): update AI postman collection
oidacra Apr 29, 2025
0e41c05
fix(postman): update AI postman collection
oidacra Apr 29, 2025
53465a7
rebase from main
oidacra Apr 30, 2025
5bbfda2
test changes ci/cd
oidacra Apr 29, 2025
16d0cd6
test
oidacra Apr 30, 2025
340377f
refactor(postman): clean up config.json formatting and update reporte…
oidacra Apr 30, 2025
37d6a41
rebase from main, resolve comments
oidacra Apr 30, 2025
5cda8dc
test rollback
oidacra Apr 30, 2025
b12aef5
chore(postman): update GraphQL and PagesResource test collections, re…
oidacra May 5, 2025
6243d4e
update all yarn.lock files
oidacra May 5, 2025
300e830
Attempting to fix Integration Test
jcastro-dotcms May 6, 2025
2246df2
Attempting to fix Postman Test
jcastro-dotcms May 6, 2025
f5b9866
Attempting to fix Postman Test
jcastro-dotcms May 7, 2025
283bb79
Attempting to fix Postman Test
jcastro-dotcms May 7, 2025
eaabe18
Attempting to fix Postman Test
jcastro-dotcms May 9, 2025
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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.20.3
v22.15.0
2 changes: 1 addition & 1 deletion core-web/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.20.3
v22.15.0
18 changes: 13 additions & 5 deletions core-web/libs/block-editor/src/lib/NodeViewRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,28 @@ import {
import { AngularRenderer } from './AngularRenderer';

import type { Node as ProseMirrorNode } from 'prosemirror-model';
import type { Decoration } from 'prosemirror-view';
import type { DecorationSource } from 'prosemirror-view';
import { DecorationSet } from 'prosemirror-view';

export type toJSONFn = (this: { node: ProseMirrorNode }) => Record<string, unknown>;

@Component({ template: '' })
export class AngularNodeViewComponent implements NodeViewProps {
@Input() editor!: NodeViewProps['editor'];
@Input() node!: NodeViewProps['node'];
@Input() decorations!: NodeViewProps['decorations'];
@Input() decorations!: readonly DecorationWithType[];
@Input() selected!: NodeViewProps['selected'];
@Input() extension!: NodeViewProps['extension'];
@Input() getPos!: NodeViewProps['getPos'];
@Input() updateAttributes!: NodeViewProps['updateAttributes'];
@Input() deleteNode!: NodeViewProps['deleteNode'];
@Input() view!: NodeViewProps['view'];
@Input() innerDecorations!: DecorationSource;
@Input() HTMLAttributes!: NodeViewProps['HTMLAttributes'];
}

interface AngularNodeViewRendererOptions extends NodeViewRendererOptions {
update?: ((node: ProseMirrorNode, decorations: Decoration[]) => boolean) | null;
update?: ((node: ProseMirrorNode, decorations: DecorationWithType[]) => boolean) | null;
toJSON?: toJSONFn;
injector: Injector;
}
Expand All @@ -42,19 +46,23 @@ class AngularNodeView extends NodeView<
> {
renderer!: AngularRenderer<AngularNodeViewComponent, NodeViewProps>;
contentDOMElement!: HTMLElement | null;
override decorations!: readonly DecorationWithType[];

override mount() {
const injector = this.options.injector as Injector;

const props: NodeViewProps = {
editor: this.editor,
node: this.node,
decorations: this.decorations,
decorations: this.decorations as readonly DecorationWithType[],
selected: false,
extension: this.extension,
getPos: () => this.getPos(),
updateAttributes: (attributes = {}) => this.updateAttributes(attributes),
deleteNode: () => this.deleteNode()
deleteNode: () => this.deleteNode(),
view: this.editor.view,
innerDecorations: DecorationSet.empty,
HTMLAttributes: {}
};

// create renderer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ declare module '@tiptap/core' {
bubbleLinkForm: {
openLinkForm: ({ openOnClick }) => ReturnType;
closeLinkForm: () => ReturnType;
setHighlight: () => ReturnType;
unsetHighlight: () => ReturnType;
};
}
}
Expand Down Expand Up @@ -47,7 +49,6 @@ export const BubbleLinkFormExtension = (viewContainerRef: ViewContainerRef, lang
?.setHighlight?.()
.command(({ tr }) => {
tr.setMeta(LINK_FORM_PLUGIN_KEY, { isOpen: true, openOnClick });

return true;
})
.freezeScroll(true)
Expand All @@ -64,7 +65,6 @@ export const BubbleLinkFormExtension = (viewContainerRef: ViewContainerRef, lang
isOpen: false,
openOnClick: false
});

return true;
})
.freezeScroll(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { filter, take } from 'rxjs/operators';
import { posToDOMRect } from '@tiptap/core';
import { BubbleMenuView } from '@tiptap/extension-bubble-menu';

import { DotContentTypeService, DotMessageService } from '@dotcms/data-access';
import { FeaturedFlags } from '@dotcms/dotcms-models';
import { ImageNode } from '../../../nodes';
import {
changeToItems,
Expand All @@ -33,8 +35,6 @@ import {
popperModifiers,
setBubbleMenuCoords
} from '../utils';
import { DotContentTypeService, DotMessageService } from '@dotcms/data-access';
import { FeaturedFlags } from '@dotcms/dotcms-models';

export const DotBubbleMenuPlugin = (options: DotBubbleMenuPluginProps) => {
const component = options.component.instance;
Expand Down Expand Up @@ -168,6 +168,7 @@ export class DotBubbleMenuPluginView extends BubbleMenuView {

this.shouldShowProp = this.shouldShow?.({
editor: this.editor,
element: this.element,
view,
state,
oldState,
Expand Down
2 changes: 1 addition & 1 deletion core-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "23.4.0-next.1",
"license": "MIT",
"engines": {
"node": ">=18.20.3"
"node": ">=v22.15.0"
},
"scripts": {
"ng": "nx",
Expand Down
Loading
Loading