Skip to content

Commit

Permalink
Make tests pass with React 16
Browse files Browse the repository at this point in the history 
Changes are cosmetic:
- React 16 no longer adds a trailing `;` to `style` attributes
- React 16 outputs `0` and not `0px` for sizes in `style`
  • Loading branch information
@renchap
renchap committed Oct 9, 2017
1 parent da78870 commit 68295d7
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions packages/slate-react/test/rendering/fixtures/custom-block-void.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ export const state = (
export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div data-slate-void="true">
<span style="display:inline-block;vertical-align:top;width:0px;color:transparent;">
<span style="display:inline-block;vertical-align:top;width:0;color:transparent">
<span>
<span data-slate-zero-width="true">&#x200A;</span>
</span>
</span>
<div contenteditable="false" style="display:inline-block;vertical-align:top;width:100%;">
<div contenteditable="false" style="display:inline-block;vertical-align:top;width:100%">
<img src="https://example.com/image.png">
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/slate-react/test/rendering/fixtures/custom-decorator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>o</span>
<span><span style="font-weight:bold;">n</span></span>
<span><span style="font-weight:bold">n</span></span>
<span>e</span>
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-react/test/rendering/fixtures/custom-inline-multiple.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>
<span data-slate-zero-width="true">&#x200A;</span>
Expand Down
4 changes: 2 additions & 2 deletions packages/slate-react/test/rendering/fixtures/custom-inline-void.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>
<span data-slate-zero-width="true">&#x200A;</span>
</span>
</span>
<span data-slate-void="true">
<span style="color:transparent;">
<span style="color:transparent">
<span>
<span data-slate-zero-width="true">&#x200A;</span>
</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-react/test/rendering/fixtures/custom-inline.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>
<span data-slate-zero-width="true">&#x200A;</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-react/test/rendering/fixtures/custom-mark-as-component.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>one</span>
<span><strong>two</strong></span>
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-react/test/rendering/fixtures/custom-mark-as-function.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>one</span>
<span><strong>two</strong></span>
Expand Down
4 changes: 2 additions & 2 deletions packages/slate-react/test/rendering/fixtures/custom-mark-as-object.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>one</span>
<span><span style="font-weight:bold;">two</span></span>
<span><span style="font-weight:bold">two</span></span>
<span>three</span>
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-react/test/rendering/fixtures/custom-mark-as-string.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>one</span>
<span><span class="bold">two</span></span>
Expand Down
4 changes: 2 additions & 2 deletions packages/slate-react/test/rendering/fixtures/default-block-with-inline.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>
<span data-slate-zero-width="true">&#x200A;</span>
</span>
</span>
<span style="position:relative;">
<span style="position:relative">
<span>
<span>word</span>
</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-react/test/rendering/fixtures/default-block.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>word</span>
</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-react/test/rendering/fixtures/empty-block-with-inline.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span><br></span>
</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/slate-react/test/rendering/fixtures/empty-block.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span><br></span>
</span>
Expand Down
6 changes: 3 additions & 3 deletions packages/slate-react/test/rendering/fixtures/nested-text-direction.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div dir="rtl" style="position:relative;">
<div style="position:relative">
<div dir="rtl" style="position:relative">
<span>
<span>مرحبا بالعالم</span>
</span>
</div>
<div dir="rtl" style="position:relative;">
<div dir="rtl" style="position:relative">
<span>
<span>שלום עולם</span>
</span>
Expand Down
6 changes: 3 additions & 3 deletions packages/slate-react/test/rendering/fixtures/text-direction.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ export const state = (

export const output = `
<div data-slate-editor="true" contenteditable="true" role="textbox">
<div style="position:relative;">
<div style="position:relative">
<span>
<span>Hello, world!</span>
</span>
</div>
<div dir="rtl" style="position:relative;">
<div dir="rtl" style="position:relative">
<span>
<span>مرحبا بالعالم</span>
</span>
</div>
<div dir="rtl" style="position:relative;">
<div dir="rtl" style="position:relative">
<span>
<span>שלום עולם</span>
</span>
Expand Down

0 comments on commit 68295d7

Please sign in to comment.