Skip to content

Commit c28a24c

Browse files
committed
Merge branch '4.x' into 5.x
2 parents 70d1707 + c3a2c42 commit c28a24c

15 files changed

Lines changed: 97 additions & 96 deletions

File tree

packages/forms/dist/components/code-editor.js

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/forms/dist/components/date-time-picker.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/forms/dist/components/file-upload.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/forms/dist/components/markdown-editor.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/forms/dist/components/rich-editor.js

Lines changed: 49 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/forms/dist/components/select.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/forms/dist/index.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/forms/resources/js/components/rich-editor/extension-custom-block.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { mergeAttributes, Node, NodePos } from '@tiptap/core'
1+
import { mergeAttributes, Node } from '@tiptap/core'
22
import { Node as ProseMirrorNode } from '@tiptap/pm/model'
3-
import { Plugin, PluginKey } from '@tiptap/pm/state'
3+
import { Plugin } from '@tiptap/pm/state'
44

55
export default Node.create({
66
name: 'customBlock',

packages/forms/resources/js/components/rich-editor/extension-mention.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ export default Node.create({
336336
const getMentionSearchResultsUsing =
337337
this.options.getMentionSearchResultsUsing
338338

339-
let suggestion = suggestionConfig
339+
let suggestion
340340

341341
if (typeof suggestionConfig?.items === 'function') {
342342
const originalItems = suggestionConfig.items

packages/panels/dist/theme.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)