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
5 changes: 5 additions & 0 deletions .changeset/dry-foxes-invite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'slate-angular': minor
---

add default string component
2 changes: 1 addition & 1 deletion packages/src/components/leaves/leaves.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { isDecoratorRangeListEqual } from '../../utils/range-list';
[viewContext]="viewContext"
[viewContext]="viewContext"
*ngFor="let context of leafContexts; trackBy: trackBy"
></slate-leaf> `,
></slate-leaf>`,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class SlateLeavesComponent extends ViewContainer<SlateLeafComponent> implements OnInit, AfterViewInit, OnChanges {
Expand Down
32 changes: 32 additions & 0 deletions packages/src/components/string/default-string.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import {
Component,
OnInit,
ChangeDetectionStrategy,
ElementRef,
ChangeDetectorRef
} from '@angular/core';
import { SlateStringContext } from '../../view/context';
import { BaseComponent } from '../../view/base';

@Component({
selector: 'span[slateDefaultString]',
template: '',
changeDetection: ChangeDetectionStrategy.OnPush
})
export class SlateDefaultStringComponent extends BaseComponent<SlateStringContext> implements OnInit {
constructor(public elementRef: ElementRef<any>, public cdr: ChangeDetectorRef) {
super(elementRef, cdr);
}

onContextChange(): void {
// Avoid breaking some browser default behaviors, such as spellCheck, android composition input state
if (this.nativeElement.innerText !== this.context.text) {
this.nativeElement.innerText = this.context.text;
}
}

ngOnInit(): void {
this.nativeElement.setAttribute('editable-text', '');
this.nativeElement.setAttribute('data-slate-string', 'true');
}
}
3 changes: 2 additions & 1 deletion packages/src/components/string/string.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Editor, Path, Node } from 'slate';
import { ViewContainerItem } from '../../view/container-item';
import { SlateLeafContext, SlateStringContext } from '../../view/context';
import { AngularEditor } from '../../plugins/angular-editor';
import { SlateDefaultStringComponent } from './default-string.component';

@Component({
selector: 'span[slateString]',
Expand Down Expand Up @@ -66,7 +67,7 @@ export class SlateStringComponent extends ViewContainerItem<SlateStringContext>
return this.viewContext.templateComponent.compatStringTemplate;
}

return this.viewContext.templateComponent.stringTemplate;
return SlateDefaultStringComponent;
}

getContext(): SlateStringContext {
Expand Down
3 changes: 0 additions & 3 deletions packages/src/components/string/template.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
<ng-template #stringTemplate let-context="context" let-viewContext="viewContext">
<span editable-text data-slate-string="true">{{ context.text }}</span>
</ng-template>
<ng-template #compatStringTemplate let-context="context" let-viewContext="viewContext">
<!-- Compatible with Chinese input in Chrome with \n -->
<span editable-text data-slate-string="true"
Expand Down
3 changes: 0 additions & 3 deletions packages/src/components/string/template.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ import { Component, ChangeDetectionStrategy, ViewChild, TemplateRef } from '@ang
changeDetection: ChangeDetectionStrategy.OnPush
})
export class SlateStringTemplateComponent {
@ViewChild('stringTemplate', { read: TemplateRef, static: true })
stringTemplate: TemplateRef<any>;

@ViewChild('compatStringTemplate', { read: TemplateRef, static: true })
compatStringTemplate: TemplateRef<any>;

Expand Down
13 changes: 11 additions & 2 deletions packages/src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { SlateLeafComponent } from './components/leaf/leaf.component';
import { SlateDefaultLeafComponent } from './components/leaf/default-leaf.component';
import { SlateLeavesComponent } from './components/leaves/leaves.component';
import { SLATE_DEFAULT_ELEMENT_COMPONENT_TOKEN } from './components/element/default-element.component.token';
import { SlateDefaultStringComponent } from './components/string/default-string.component';

@NgModule({
declarations: [
Expand All @@ -29,10 +30,18 @@ import { SLATE_DEFAULT_ELEMENT_COMPONENT_TOKEN } from './components/element/defa
SlateBlockCardComponent,
SlateLeafComponent,
SlateLeavesComponent,
SlateDefaultLeafComponent
SlateDefaultLeafComponent,
SlateDefaultStringComponent
],
imports: [CommonModule],
exports: [SlateEditableComponent, SlateChildrenComponent, SlateElementComponent, SlateLeavesComponent, SlateStringComponent],
exports: [
SlateEditableComponent,
SlateChildrenComponent,
SlateElementComponent,
SlateLeavesComponent,
SlateStringComponent,
SlateDefaultStringComponent
],
providers: [
{
provide: SLATE_DEFAULT_ELEMENT_COMPONENT_TOKEN,
Expand Down