-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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
Add formats option for specifying allowed formats #4053
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
packages/quill/src/core/utils/createRegistryWithFormats.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
import { Registry } from 'parchment'; | ||
|
||
const MAX_REGISTER_ITERATIONS = 100; | ||
const CORE_FORMATS = ['block', 'break', 'cursor', 'inline', 'scroll', 'text']; | ||
|
||
const createRegistryWithFormats = ( | ||
formats: string[], | ||
sourceRegistry: Registry, | ||
debug: { error: (errorMessage: string) => void }, | ||
) => { | ||
const registry = new Registry(); | ||
CORE_FORMATS.forEach((name) => { | ||
const coreBlot = sourceRegistry.query(name); | ||
if (coreBlot) registry.register(coreBlot); | ||
}); | ||
|
||
formats.forEach((name) => { | ||
let format = sourceRegistry.query(name); | ||
if (!format) { | ||
debug.error( | ||
`Cannot register "${name}" specified in "formats" config. Are you sure it was registered?`, | ||
); | ||
} | ||
let iterations = 0; | ||
while (format) { | ||
registry.register(format); | ||
format = 'blotName' in format ? format.requiredContainer ?? null : null; | ||
|
||
iterations += 1; | ||
if (iterations > MAX_REGISTER_ITERATIONS) { | ||
debug.error( | ||
`Cycle detected in registering blot requiredContainer: "${name}"`, | ||
); | ||
break; | ||
} | ||
} | ||
}); | ||
|
||
return registry; | ||
}; | ||
|
||
export default createRegistryWithFormats; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
packages/quill/test/unit/core/utils/createRegistryWithFormats.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
import '../../../../src/quill.js'; | ||
import { describe, expect, test, vitest } from 'vitest'; | ||
import createRegistryWithFormats from '../../../../src/core/utils/createRegistryWithFormats.js'; | ||
import { globalRegistry } from '../../../../src/core/quill.js'; | ||
import logger from '../../../../src/core/logger.js'; | ||
import { Registry } from 'parchment'; | ||
import Inline from '../../../../src/blots/inline.js'; | ||
import Container from '../../../../src/blots/container.js'; | ||
|
||
const debug = logger('test'); | ||
|
||
describe('createRegistryWithFormats', () => { | ||
test('register core formats', () => { | ||
const registry = createRegistryWithFormats([], globalRegistry, debug); | ||
expect(registry.query('cursor')).toBeTruthy(); | ||
expect(registry.query('bold')).toBeFalsy(); | ||
}); | ||
|
||
test('register specified formats', () => { | ||
const registry = createRegistryWithFormats(['bold'], globalRegistry, debug); | ||
expect(registry.query('cursor')).toBeTruthy(); | ||
expect(registry.query('bold')).toBeTruthy(); | ||
}); | ||
|
||
test('register required container', () => { | ||
const sourceRegistry = new Registry(); | ||
|
||
class RequiredContainer extends Container { | ||
static blotName = 'my-required-container'; | ||
} | ||
class Child extends Inline { | ||
static requiredContainer = RequiredContainer; | ||
static blotName = 'my-child'; | ||
} | ||
|
||
sourceRegistry.register(Child); | ||
|
||
const registry = createRegistryWithFormats( | ||
['my-child'], | ||
sourceRegistry, | ||
debug, | ||
); | ||
|
||
expect(registry.query('my-child')).toBeTruthy(); | ||
expect(registry.query('my-required-container')).toBeTruthy(); | ||
}); | ||
|
||
test('infinite loop', () => { | ||
const sourceRegistry = new Registry(); | ||
|
||
class InfiniteBlot extends Inline { | ||
static requiredContainer = InfiniteBlot; | ||
static blotName = 'infinite-blot'; | ||
} | ||
|
||
sourceRegistry.register(InfiniteBlot); | ||
|
||
const logError = vitest.spyOn(debug, 'error'); | ||
const registry = createRegistryWithFormats( | ||
['infinite-blot'], | ||
sourceRegistry, | ||
debug, | ||
); | ||
|
||
expect(registry.query('infinite-blot')).toBeTruthy(); | ||
expect(logError).toHaveBeenCalledWith( | ||
expect.stringMatching('Cycle detected'), | ||
); | ||
}); | ||
|
||
test('report missing formats', () => { | ||
const logError = vitest.spyOn(debug, 'error'); | ||
const registry = createRegistryWithFormats( | ||
['my-unknown'], | ||
globalRegistry, | ||
debug, | ||
); | ||
expect(registry.query('my-unknown')).toBeFalsy(); | ||
expect(logError).toHaveBeenCalledWith(expect.stringMatching('my-unknown')); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should suppress the warning in case two formats have the same requiredContainer