Skip to content

Toggle side toolbar on click #2

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.

Sign up for GitHub

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

Open
svnm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Toggle side toolbar on click #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions draft-js-buttons/src/utils/createBlockAlignmentButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default ({ alignment, children }) => (

activate = (event) => {
event.preventDefault();
event.stopPropagation();
this.props.setAlignment({ alignment });
}

Expand Down
1 change: 1 addition & 0 deletions draft-js-buttons/src/utils/createBlockStyleButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export default ({ blockType, children }) => (

toggleStyle = (event) => {
event.preventDefault();
event.stopPropagation();
this.props.setEditorState(
RichUtils.toggleBlockType(
this.props.getEditorState(),
Expand Down
1 change: 1 addition & 0 deletions draft-js-buttons/src/utils/createInlineStyleButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export default ({ style, children }) => (

toggleStyle = (event) => {
event.preventDefault();
event.stopPropagation();
this.props.setEditorState(
RichUtils.toggleInlineStyle(
this.props.getEditorState(),
Expand Down
33 changes: 14 additions & 19 deletions draft-js-side-toolbar-plugin/src/components/BlockTypeSelect/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,36 @@ import React from 'react';
export default class BlockTypeSelect extends React.Component {

state = {
visible: false,
style: {
transform: 'translate(-50%) scale(0)',
transition: 'transform 0.15s cubic-bezier(.3,1.2,.2,1)',
}
}

onMouseEnter = () => {
this.setState({
style: {
transform: 'translate(-50%) scale(1)',
transition: 'transform 0.15s cubic-bezier(.3,1.2,.2,1)',
},
});
onClick = (e) => {
e.stopPropagation();
return this.state.visible ? this.hide() : this.show();
}

onMouseLeave = () => {
show = () => {
this.setState({
style: {
transform: 'translate(-50%) scale(0)',
},
visible: true,
style: { transform: 'translate(-50%) scale(1)' }
});
}

onMouseDown = (clickEvent) => {
clickEvent.preventDefault();
clickEvent.stopPropagation();
hide = () => {
this.setState({
visible: false,
style: { transform: 'translate(-50%) scale(0)' }
});
}

render() {
const { theme, getEditorState, setEditorState } = this.props;
return (
<div
onMouseEnter={this.onMouseEnter}
onMouseLeave={this.onMouseLeave}
onMouseDown={this.onClick}
>
<div onClick={this.onClick}>
<div className={theme.blockTypeSelectStyles.blockType}>
<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="M0 0h24v24H0z" fill="none" />
Expand Down
2 changes: 1 addition & 1 deletion draft-js-side-toolbar-plugin/src/components/DefaultBlockTypeSelect/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
CodeBlockButton,
UnorderedListButton,
OrderedListButton,
} from 'draft-js-buttons'; // eslint-disable-line import/no-unresolved
} from '../../../../draft-js-buttons/src/'; // eslint-disable-line import/no-unresolved

import BlockTypeSelect from '../BlockTypeSelect';

Expand Down
12 changes: 2 additions & 10 deletions draft-js-side-toolbar-plugin/src/components/Toolbar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,6 @@ export default class Toolbar extends React.Component {

onEditorStateChange = (editorState) => {
const selection = editorState.getSelection();
if (!selection.getHasFocus()) {
this.setState({
position: {
transform: 'scale(0)',
},
});
return;
}

const currentContent = editorState.getCurrentContent();
const currentBlock = currentContent.getBlockForKey(selection.getStartKey());
// TODO verify that always a key-0-0 exists
Expand All @@ -37,13 +28,14 @@ export default class Toolbar extends React.Component {
const node = document.querySelectorAll(`[data-offset-key="${offsetKey}"]`)[0];
const top = node.getBoundingClientRect().top;
const editor = this.props.store.getItem('getEditorRef')().refs.editor;

this.setState({
position: {
top: (top + window.scrollY),
left: editor.getBoundingClientRect().left - 80,
transform: 'scale(1)',
transition: 'transform 0.15s cubic-bezier(.3,1.2,.2,1)',
},
}
});
}, 0);
}
Expand Down