Skip to content

Commit

Permalink
Tests: Added a Table feature to the Highlight manual test.
Browse files Browse the repository at this point in the history
  • Loading branch information
oleq committed Jun 9, 2020
1 parent c232d59 commit 5977951
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 14 deletions.
56 changes: 45 additions & 11 deletions packages/ckeditor5-engine/tests/manual/highlight.html
Original file line number Diff line number Diff line change
@@ -1,37 +1,61 @@
<style>
:root {
--ck-manual-test-highlight-yellow: hsla(60, 100%, 50%, 0.5);
--ck-manual-test-highlight-red: hsla(0, 100%, 50%, 0.5);
--ck-manual-test-highlight-blue: hsla(240, 100%, 50%, 0.5);
}

span.highlight-yellow {
background-color: rgba( 255, 255, 0, 0.5 );
background-color: var(--ck-manual-test-highlight-yellow);
}

span.highlight-blue {
background-color: rgba( 0, 0, 255, 0.5 );
background-color: var(--ck-manual-test-highlight-blue);
}

span.highlight-red {
background-color: rgba( 255, 0, 0, 0.5 );
background-color: var(--ck-manual-test-highlight-red);
}

.ck-widget.fancy-widget {
background-color: black;
color: white;
background-color: hsl(0, 0%, 0%);
color: hsl(0, 0%, 100%);
text-align: center;
height: 40px;
line-height: 40px;
}

.ck-widget.fancy-widget.highlight-yellow {
background-color: yellow;
color: black;
background-color: var(--ck-manual-test-highlight-yellow);
color: hsl(0, 0%, 0%);
}

.ck-widget.fancy-widget.highlight-blue {
background-color: blue;
color: black;
background-color: var(--ck-manual-test-highlight-blue);
color: hsl(0, 0%, 0%);
}

.ck-widget.fancy-widget.highlight-red {
background-color: red;
color: black;
background-color: var(--ck-manual-test-highlight-red);
color: hsl(0, 0%, 0%);
}

.table td.highlight-yellow,
.table th.highlight-yellow {
/* !important to override selected editable styles. */
background-color: var(--ck-manual-test-highlight-yellow) !important;
}

.table td.highlight-blue,
.table th.highlight-blue {
/* !important to override selected editable styles. */
background-color: var(--ck-manual-test-highlight-blue) !important;
}

.table td.highlight-red,
.table th.highlight-red {
/* !important to override selected editable styles. */
background-color: var(--ck-manual-test-highlight-red) !important;
}

button {
Expand All @@ -43,6 +67,16 @@
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas at diam quis justo imperdiet posuere non eu tortor. Mauris vel magna eu sem hendrerit varius. Ut imperdiet velit ut ante interdum convallis. Vestibulum vitae lacinia mi. </p>
<figure></figure>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas at diam quis justo imperdiet posuere non eu tortor. Mauris vel magna eu sem hendrerit varius. Ut imperdiet velit ut ante interdum convallis. Vestibulum vitae lacinia mi. </p>
<table>
<tr>
<td>foo</td>
<td>bar</td>
</tr>
<tr>
<td>baz</td>
<td>qux</td>
</tr>
</table>
</div>
<h2>Markers</h2>
<button id="add-marker-yellow">Set yellow highlight</button><button id="remove-marker-yellow">Remove yellow highlight</button>
Expand Down
5 changes: 3 additions & 2 deletions packages/ckeditor5-engine/tests/manual/highlight.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
import List from '@ckeditor/ckeditor5-list/src/list';
import global from '@ckeditor/ckeditor5-utils/src/dom/global';
import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
import Table from '@ckeditor/ckeditor5-table/src/table';
import Widget from '@ckeditor/ckeditor5-widget/src/widget';
import { toWidget } from '@ckeditor/ckeditor5-widget/src/utils';

Expand Down Expand Up @@ -53,8 +54,8 @@ class FancyWidget extends Plugin {
}

ClassicEditor.create( global.document.querySelector( '#editor' ), {
plugins: [ Enter, Typing, Paragraph, Undo, Heading, Bold, Italic, List, FancyWidget ],
toolbar: [ 'heading', '|', 'undo', 'redo', 'bold', 'italic', 'numberedList', 'bulletedList' ]
plugins: [ Enter, Typing, Paragraph, Undo, Heading, Bold, Italic, List, Table, FancyWidget ],
toolbar: [ 'heading', '|', 'undo', 'redo', 'bold', 'italic', 'numberedList', 'bulletedList', 'insertTable' ]
} )
.then( editor => {
window.editor = editor;
Expand Down
7 changes: 6 additions & 1 deletion packages/ckeditor5-engine/tests/manual/highlight.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,10 @@ applied.
1. Red highlight should be visible on the whole content, including the widget.
1. Play with highlights, add and remove them, check if they are applied correctly.

NOTE: Yellow highlight should be visible over red and blue one. Red highlight should be visible over blue one.
### Highlighting table cells

1. You can select the entire table cell and apply a highlight to it.
1. The highlight should change the background of an **entire cell** (not only its content).

NOTE: Yellow highlight should be visible over red and blue one. Red highlight should be visible over blue one.

0 comments on commit 5977951

Please sign in to comment.