From 984581e01a5fe3dd2f3da3ca06c1eca17dc0704b Mon Sep 17 00:00:00 2001 From: Bojan Zivkovic Date: Thu, 15 Mar 2018 23:39:32 -0400 Subject: [PATCH 1/2] Adding mac keyboard bindings --- src/components/App.jsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/App.jsx b/src/components/App.jsx index ba10485b..da451527 100644 --- a/src/components/App.jsx +++ b/src/components/App.jsx @@ -76,12 +76,16 @@ export default class App extends React.Component { componentDidMount() { Mousetrap.bind(['ctrl+z'], this.onUndo.bind(this)); + Mousetrap.bind(['command+z'], this.onUndo.bind(this)); Mousetrap.bind(['ctrl+y'], this.onRedo.bind(this)); + Mousetrap.bind(['command+shift+z'], this.onRedo.bind(this)); } componentWillUnmount() { Mousetrap.unbind(['ctrl+z'], this.onUndo.bind(this)); + Mousetrap.unbind(['command+z'], this.onUndo.bind(this)); Mousetrap.unbind(['ctrl+y'], this.onRedo.bind(this)); + Mousetrap.unbind(['command+shift+z'], this.onRedo.bind(this)); } onReset() { From 7dfc5029a3a804f274c2eae0f1dfd0321752f74a Mon Sep 17 00:00:00 2001 From: Bojan Zivkovic Date: Fri, 16 Mar 2018 23:00:33 -0400 Subject: [PATCH 2/2] Improving keyboard bindings code --- src/components/App.jsx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/components/App.jsx b/src/components/App.jsx index da451527..f1a359e4 100644 --- a/src/components/App.jsx +++ b/src/components/App.jsx @@ -75,17 +75,13 @@ export default class App extends React.Component { } componentDidMount() { - Mousetrap.bind(['ctrl+z'], this.onUndo.bind(this)); - Mousetrap.bind(['command+z'], this.onUndo.bind(this)); - Mousetrap.bind(['ctrl+y'], this.onRedo.bind(this)); - Mousetrap.bind(['command+shift+z'], this.onRedo.bind(this)); + Mousetrap.bind(['mod+z'], this.onUndo.bind(this)); + Mousetrap.bind(['mod+y', 'mod+shift+z'], this.onRedo.bind(this)); } componentWillUnmount() { - Mousetrap.unbind(['ctrl+z'], this.onUndo.bind(this)); - Mousetrap.unbind(['command+z'], this.onUndo.bind(this)); - Mousetrap.unbind(['ctrl+y'], this.onRedo.bind(this)); - Mousetrap.unbind(['command+shift+z'], this.onRedo.bind(this)); + Mousetrap.unbind(['mod+z'], this.onUndo.bind(this)); + Mousetrap.unbind(['mod+y', 'mod+shift+z'], this.onRedo.bind(this)); } onReset() {