Skip to content
This repository has been archived by the owner on Nov 4, 2021. It is now read-only.

Feature slate v0.31.3 #51

Merged
merged 30 commits into from
Jan 11, 2018
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a22174c
feat(package): upgrade react, enzyme and other deps #50
gabrielrtakeda Nov 28, 2017
8569b19
chore: rename slate State object to slate Value object #50
gabrielrtakeda Nov 28, 2017
6e39582
chore: update slate api schema object #50
gabrielrtakeda Nov 28, 2017
07e4c76
feat(tests): upgrade all deps and test suite tools #50
gabrielrtakeda Nov 28, 2017
330963e
chore(test): standard test ext name; better organize utils #50
gabrielrtakeda Nov 28, 2017
1dd7322
chore(utils): better organize utils files #50
gabrielrtakeda Nov 28, 2017
d83b125
chore(editor): update initial editor state object #50
gabrielrtakeda Nov 28, 2017
735ba3b
chore(alignment-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
570feee
chore(bold-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
8b93785
chore(color-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
f892dd1
chore(embed-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
3dabdb0
chore(font-family-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
aac67a2
chore(font-size-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
01fa065
chore(grid-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
5b0bc35
chore(italic-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
6135b40
chore(list-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
044285f
chore(strikethrough-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
fb077c1
chore(underline-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 28, 2017
08f8036
chore(editor): implements renderNode and renderMarks #50
gabrielrtakeda Nov 28, 2017
7eddbd6
chore: fix warnings on plugins and example page
igr-santos Nov 29, 2017
21add6d
chore(image-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 29, 2017
0ef65f5
chore(link-plugin): adapt to slate v0.31.3 api #50
gabrielrtakeda Nov 29, 2017
166bd6d
chore: fix image alt warning #50
gabrielrtakeda Nov 29, 2017
96d9862
chore: fix controlled to uncontrolled state of inputs close #50
gabrielrtakeda Nov 29, 2017
4c566cc
feat(slate): migrate value object from v0.25.3 to v0.31.3 #50
gabrielrtakeda Nov 29, 2017
1840185
fix: editor initial state object #50
gabrielrtakeda Nov 29, 2017
d1db0a6
chore: build lib v0.31.3
igr-santos Nov 29, 2017
d57d5e6
fix(package): upgrade react-s3-uploader to v4.6.0
gabrielrtakeda Dec 14, 2017
6ad5ff2
fix(packages): remove caret range from slate and slate-react
gabrielrtakeda Jan 9, 2018
0af5b4e
chore: remove changeState prop from SlateContent component
gabrielrtakeda Jan 11, 2018
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
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": ["react", "es2015", "stage-0"],
"presets": ["react", "env", "stage-0"],
}
52 changes: 0 additions & 52 deletions lib/SlateEditor/SlateContent.js

This file was deleted.

44 changes: 0 additions & 44 deletions lib/SlateEditor/__tests__/Utils.spec.js

This file was deleted.

4 changes: 2 additions & 2 deletions lib/components/button/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var _react = require('react');

var _react2 = _interopRequireDefault(_react);

var _Utils = require('./../../SlateEditor/Utils');
var _typeCheck = require('../../utils/type-check');

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

Expand All @@ -32,7 +32,7 @@ var Button = function Button(_ref) {
style: style,
type: type,
onClick: function onClick(e) {
return (0, _Utils.isFunction)(_onClick) && _onClick(e);
return (0, _typeCheck.isFunction)(_onClick) && _onClick(e);
},
className: className
}, props),
Expand Down
6 changes: 3 additions & 3 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
value: true
});

var _SlateEditor = require('./SlateEditor');
var _slateEditor = require('./slate-editor');

Object.keys(_SlateEditor).forEach(function (key) {
Object.keys(_slateEditor).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function get() {
return _SlateEditor[key];
return _slateEditor[key];
}
});
});
Expand Down
6 changes: 3 additions & 3 deletions lib/plugins/slate-alignment-plugin/AlignmentCenterButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var _AlignmentUtils = require('./AlignmentUtils');
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var AlignmentCenterButton = function AlignmentCenterButton(_ref) {
var state = _ref.state,
var value = _ref.value,
onChange = _ref.onChange,
changeState = _ref.changeState,
className = _ref.className,
Expand All @@ -35,9 +35,9 @@ var AlignmentCenterButton = function AlignmentCenterButton(_ref) {
style: style,
type: type,
onClick: function onClick(e) {
return onChange((0, _AlignmentUtils.alignmentMarkStrategy)(state.change(), 'center'));
return onChange((0, _AlignmentUtils.alignmentMarkStrategy)(value.change(), 'center'));
},
className: (0, _classnames2.default)('slate-alignment-plugin--button', { active: (0, _AlignmentUtils.hasMark)(state) && (0, _AlignmentUtils.getMark)(state).data.get('align') === 'center' }, className)
className: (0, _classnames2.default)('slate-alignment-plugin--button', { active: (0, _AlignmentUtils.hasMark)(value) && (0, _AlignmentUtils.getMark)(value).data.get('align') === 'center' }, className)
},
_react2.default.createElement(_reactFontawesome2.default, { name: 'align-center' })
);
Expand Down
20 changes: 10 additions & 10 deletions lib/plugins/slate-alignment-plugin/AlignmentKeyboardShortcut.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,28 @@ Object.defineProperty(exports, "__esModule", {

var _AlignmentUtils = require('./AlignmentUtils');

var AlignmentKeyboardShortcut = function AlignmentKeyboardShortcut(event, data, change) {
var keyLeft = data.key === 'l';
var macLeft = data.isCmd && data.isShift && keyLeft;
var winLeft = data.isAlt && data.isShift && keyLeft;
var AlignmentKeyboardShortcut = function AlignmentKeyboardShortcut(event, change) {
var keyLeft = event.key === 'l';
var macLeft = event.metaKey && event.shiftKey && keyLeft;
var winLeft = event.altKey && event.shiftKey && keyLeft;
var isLeft = macLeft || winLeft;
if (isLeft) {
event.preventDefault();
return (0, _AlignmentUtils.alignLeft)(change);
}

var keyCenter = data.key === 'c';
var macCenter = data.isCmd && data.isShift && keyCenter;
var winCenter = data.isAlt && data.isShift && keyCenter;
var keyCenter = event.key === 'c';
var macCenter = event.metaKey && event.shiftKey && keyCenter;
var winCenter = event.altKey && event.shiftKey && keyCenter;
var isCenter = macCenter || winCenter;
if (isCenter) {
event.preventDefault();
return (0, _AlignmentUtils.alignCenter)(change);
}

var keyRight = data.key === 'r';
var macRight = data.isCmd && data.isShift && keyRight;
var winRight = data.isAlt && data.isShift && keyRight;
var keyRight = event.key === 'r';
var macRight = event.metaKey && event.shiftKey && keyRight;
var winRight = event.altKey && event.shiftKey && keyRight;
var isRight = macRight || winRight;
if (isRight) {
event.preventDefault();
Expand Down
6 changes: 3 additions & 3 deletions lib/plugins/slate-alignment-plugin/AlignmentLeftButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var _AlignmentUtils = require('./AlignmentUtils');
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var AlignmentLeftButton = function AlignmentLeftButton(_ref) {
var state = _ref.state,
var value = _ref.value,
onChange = _ref.onChange,
changeState = _ref.changeState,
className = _ref.className,
Expand All @@ -35,9 +35,9 @@ var AlignmentLeftButton = function AlignmentLeftButton(_ref) {
style: style,
type: type,
onClick: function onClick(e) {
return onChange((0, _AlignmentUtils.alignmentMarkStrategy)(state.change(), 'left'));
return onChange((0, _AlignmentUtils.alignmentMarkStrategy)(value.change(), 'left'));
},
className: (0, _classnames2.default)('slate-alignment-plugin--button', { active: (0, _AlignmentUtils.hasMark)(state) && (0, _AlignmentUtils.getMark)(state).data.get('align') === 'left' }, className)
className: (0, _classnames2.default)('slate-alignment-plugin--button', { active: (0, _AlignmentUtils.hasMark)(value) && (0, _AlignmentUtils.getMark)(value).data.get('align') === 'left' }, className)
},
_react2.default.createElement(_reactFontawesome2.default, { name: 'align-left' })
);
Expand Down
6 changes: 3 additions & 3 deletions lib/plugins/slate-alignment-plugin/AlignmentRightButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var _AlignmentUtils = require('./AlignmentUtils');
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var AlignmentRightButton = function AlignmentRightButton(_ref) {
var state = _ref.state,
var value = _ref.value,
onChange = _ref.onChange,
changeState = _ref.changeState,
className = _ref.className,
Expand All @@ -35,9 +35,9 @@ var AlignmentRightButton = function AlignmentRightButton(_ref) {
style: style,
type: type,
onClick: function onClick(e) {
return onChange((0, _AlignmentUtils.alignmentMarkStrategy)(state.change(), 'right'));
return onChange((0, _AlignmentUtils.alignmentMarkStrategy)(value.change(), 'right'));
},
className: (0, _classnames2.default)('slate-alignment-plugin--button', { active: (0, _AlignmentUtils.hasMark)(state) && (0, _AlignmentUtils.getMark)(state).data.get('align') === 'right' }, className)
className: (0, _classnames2.default)('slate-alignment-plugin--button', { active: (0, _AlignmentUtils.hasMark)(value) && (0, _AlignmentUtils.getMark)(value).data.get('align') === 'right' }, className)
},
_react2.default.createElement(_reactFontawesome2.default, { name: 'align-right' })
);
Expand Down
19 changes: 0 additions & 19 deletions lib/plugins/slate-alignment-plugin/AlignmentSchema.js

This file was deleted.

14 changes: 7 additions & 7 deletions lib/plugins/slate-alignment-plugin/AlignmentUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
var hasMark = exports.hasMark = function hasMark(state) {
return state.blocks.some(function (node) {
var hasMark = exports.hasMark = function hasMark(value) {
return value.blocks.some(function (node) {
return node.type === 'alignment';
});
};
var getMark = exports.getMark = function getMark(state) {
return state.blocks.filter(function (node) {
var getMark = exports.getMark = function getMark(value) {
return value.blocks.filter(function (node) {
return node.type === 'alignment';
}).first();
};
var getType = exports.getType = function getType(state) {
return state.blocks.first().type;
var getType = exports.getType = function getType(value) {
return value.blocks.first().type;
};

var alignmentMarkStrategy = exports.alignmentMarkStrategy = function alignmentMarkStrategy(change, align) {
return change.setBlock({
type: 'alignment',
data: { align: align, currentBlockType: getType(change.state) }
data: { align: align, currentBlockType: getType(change.value) }
}).focus();
};

Expand Down
1 change: 0 additions & 1 deletion lib/plugins/slate-alignment-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ class SlateEditor extends Component {

| Target | Description |
|---------------------------|--------------------------------------------------------------------------------|
| AlignmentSchema | Schema object to configure the plugin. |
| AlignmentNode | Component that holds the html that will wrap the content with alignment style. |
| AlignmentUtils | Generic file that holds the util common functions. |
| AlignmentButtonBar | Component that holds all action buttons to handle the alignment behaviour. |
Expand Down
15 changes: 4 additions & 11 deletions lib/plugins/slate-alignment-plugin/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.AlignmentRightButton = exports.AlignmentCenterButton = exports.AlignmentLeftButton = exports.AlignmentButtonBar = exports.AlignmentUtils = exports.AlignmentKeyboardShortcut = exports.AlignmentNode = exports.AlignmentSchema = exports.AlignmentPlugin = undefined;

var _AlignmentSchema = require('./AlignmentSchema');

var _AlignmentSchema2 = _interopRequireDefault(_AlignmentSchema);
exports.AlignmentRightButton = exports.AlignmentCenterButton = exports.AlignmentLeftButton = exports.AlignmentButtonBar = exports.AlignmentUtils = exports.AlignmentKeyboardShortcut = exports.AlignmentNode = exports.AlignmentPlugin = undefined;

var _AlignmentNode = require('./AlignmentNode');

Expand Down Expand Up @@ -44,13 +40,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
//
// Keyboard
//
//
// Schema
//
var AlignmentPlugin = function AlignmentPlugin(options) {
return {
schema: _AlignmentSchema2.default,

onKeyDown: function onKeyDown() {
return _AlignmentKeyboardShortcut2.default.apply(undefined, arguments);
}
Expand All @@ -60,8 +51,10 @@ var AlignmentPlugin = function AlignmentPlugin(options) {
//
// External
//
//
// Rendering
//
exports.AlignmentPlugin = AlignmentPlugin;
exports.AlignmentSchema = _AlignmentSchema2.default;
exports.AlignmentNode = _AlignmentNode2.default;
exports.AlignmentKeyboardShortcut = _AlignmentKeyboardShortcut2.default;
exports.AlignmentUtils = AlignmentUtils;
Expand Down
6 changes: 3 additions & 3 deletions lib/plugins/slate-bold-plugin/BoldButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var _BoldUtils = require('./BoldUtils');
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var BoldButton = function BoldButton(_ref) {
var state = _ref.state,
var value = _ref.value,
onChange = _ref.onChange,
changeState = _ref.changeState,
className = _ref.className,
Expand All @@ -35,9 +35,9 @@ var BoldButton = function BoldButton(_ref) {
style: style,
type: type,
onClick: function onClick(e) {
return onChange((0, _BoldUtils.boldMarkStrategy)(state.change()));
return onChange((0, _BoldUtils.boldMarkStrategy)(value.change()));
},
className: (0, _classnames2.default)('slate-bold-plugin--button', { active: (0, _BoldUtils.hasMark)(state) }, className)
className: (0, _classnames2.default)('slate-bold-plugin--button', { active: (0, _BoldUtils.hasMark)(value) }, className)
},
_react2.default.createElement(_reactFontawesome2.default, { name: 'bold' })
);
Expand Down
6 changes: 4 additions & 2 deletions lib/plugins/slate-bold-plugin/BoldKeyboardShortcut.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ Object.defineProperty(exports, "__esModule", {
value: true
});

var _keyboardEvent = require('../../utils/keyboard-event');

var _BoldUtils = require('./BoldUtils');

var BoldKeyboardShortcut = function BoldKeyboardShortcut(event, data, change) {
if (data.isMod && data.key === 'b') return (0, _BoldUtils.boldMarkStrategy)(change);
var BoldKeyboardShortcut = function BoldKeyboardShortcut(event, change) {
if ((0, _keyboardEvent.isMod)(event) && event.key === 'b') return (0, _BoldUtils.boldMarkStrategy)(change);
return;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ var _react2 = _interopRequireDefault(_react);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var ListNode = function ListNode(_ref) {
var BoldMark = function BoldMark(_ref) {
var children = _ref.children;
return _react2.default.createElement(
'b',
'strong',
null,
children
);
};

exports.default = ListNode;
exports.default = BoldMark;
Loading