feat(examples): add nav bar

dist/ReactFlow.esm.js

@@ -7202,17 +7202,21 @@ function addEvent(el
 /*: string*/
 , handler
 /*: Function*/
+, inputOptions
+/*: Object*/
 )
 /*: void*/
 {
-  if (!el) {
+  if (!el) return;
-    return;
+  const options = {
-  }
+    capture: true,
+    ...inputOptions
+  };
 
-  if (el.attachEvent) {
+  if (el.addEventListener) {
+    el.addEventListener(event, handler, options);
+  } else if (el.attachEvent) {
     el.attachEvent('on' + event, handler);
-  } else if (el.addEventListener) {
-    el.addEventListener(event, handler, true);
   } else {
     // $FlowIgnore: Doesn't think elements are indexable
     el['on' + event] = handler;
@@ -7224,17 +7228,21 @@ function removeEvent(el
 /*: string*/
 , handler
 /*: Function*/
+, inputOptions
+/*: Object*/
 )
 /*: void*/
 {
-  if (!el) {
+  if (!el) return;
-    return;
+  const options = {
-  }
+    capture: true,
+    ...inputOptions
+  };
 
-  if (el.detachEvent) {
+  if (el.removeEventListener) {
+    el.removeEventListener(event, handler, options);
+  } else if (el.detachEvent) {
     el.detachEvent('on' + event, handler);
-  } else if (el.removeEventListener) {
-    el.removeEventListener(event, handler, true);
   } else {
     // $FlowIgnore: Doesn't think elements are indexable
     el['on' + event] = null;
@@ -7395,30 +7403,26 @@ function addUserSelectStyles(doc
 function removeUserSelectStyles(doc
 /*: ?Document*/
 ) {
+  if (!doc) return;
+
   try {
-    if (doc && doc.body) removeClassName(doc.body, 'react-draggable-transparent-selection'); // $FlowIgnore: IE
+    if (doc.body) removeClassName(doc.body, 'react-draggable-transparent-selection'); // $FlowIgnore: IE
 
     if (doc.selection) {
       // $FlowIgnore: IE
       doc.selection.empty();
     } else {
-      window.getSelection().removeAllRanges(); // remove selection caused by scroll
+      // Remove selection caused by scroll, unless it's a focused input
+      // (we use doc.defaultView in case we're in an iframe)
+      const selection = (doc.defaultView || window).getSelection();
+
+      if (selection && selection.type !== 'Caret') {
+        selection.removeAllRanges();
+      }
     }
   } catch (e) {// probably IE
   }
 }
-function styleHacks(childStyle
-/*: Object*/
-= {})
-/*: Object*/
-{
-  // Workaround IE pointer events; see #51
-  // https://github.com/mzabriskie/react-draggable/issues/51#issuecomment-103488278
-  return {
-    touchAction: 'none',
-    ...childStyle
-  };
-}
 function addClassName(el
 /*: HTMLElement*/
 , className
@@ -7708,7 +7712,9 @@ let dragEventFor = eventsFor.mouse;
 // <DraggableCore> is for advanced usage of <Draggable>. It maintains minimal internal state so it can
 // work well with libraries that require more control over the element.
 //
-class DraggableCore extends React__default.Component {
+class DraggableCore extends React__default.Component
+/*:: <DraggableCoreProps, DraggableCoreState>*/
+{
   constructor(...args) {
     super(...args);
 
@@ -7720,6 +7726,8 @@ class DraggableCore extends React__default.Component {
       touchIdentifier: null
     });
 
+    _defineProperty$1(this, "mounted", false);
+
     _defineProperty$1(this, "handleDragStart", e => {
       // Make it possible to attach event handlers on top of this one.
       this.props.onMouseDown(e); // Only accept left-clicks.
@@ -7738,11 +7746,14 @@ class DraggableCore extends React__default.Component {
 
       if (this.props.disabled || !(e.target instanceof ownerDocument.defaultView.Node) || this.props.handle && !matchesSelectorAndParentsTo(e.target, this.props.handle, thisNode) || this.props.cancel && matchesSelectorAndParentsTo(e.target, this.props.cancel, thisNode)) {
         return;
-      } // Set touch identifier in component state if this is a touch event. This allows us to
+      } // Prevent scrolling on mobile devices, like ipad/iphone.
+      // Important that this is after handle/cancel.
+
+
+      if (e.type === 'touchstart') e.preventDefault(); // Set touch identifier in component state if this is a touch event. This allows us to
       // distinguish between individual touches on multitouch screens by identifying which
       // touchpoint was set to this element.
 
-
       const touchIdentifier = getTouchIdentifier(e);
       this.setState({
         touchIdentifier
@@ -7760,7 +7771,7 @@ class DraggableCore extends React__default.Component {
 
       log('calling', this.props.onStart);
       const shouldUpdate = this.props.onStart(e, coreEvent);
-      if (shouldUpdate === false) return; // Add a style to the body to disable user-select. This prevents text from
+      if (shouldUpdate === false || this.mounted === false) return; // Add a style to the body to disable user-select. This prevents text from
       // being selected all over the page.
 
       if (this.props.enableUserSelectHack) addUserSelectStyles(ownerDocument); // Initiate dragging. Set the current x and y as offsets
@@ -7780,9 +7791,7 @@ class DraggableCore extends React__default.Component {
     });
 
     _defineProperty$1(this, "handleDrag", e => {
-      // Prevent scrolling on mobile devices, like ipad/iphone.
+      // Get the current drag point from the event. This is used as the offset.
-      if (e.type === 'touchmove') e.preventDefault(); // Get the current drag point from the event. This is used as the offset.
-
       const position = getControlPosition(e, this.state.touchIdentifier, this);
       if (position == null) return;
       let {
@@ -7803,7 +7812,7 @@ class DraggableCore extends React__default.Component {
 
       const shouldUpdate = this.props.onDrag(e, coreEvent);
 
-      if (shouldUpdate === false) {
+      if (shouldUpdate === false || this.mounted === false) {
         try {
           // $FlowIgnore
           this.handleDragStop(new MouseEvent('mouseup'));
@@ -7837,7 +7846,10 @@ class DraggableCore extends React__default.Component {
         x,
         y
       } = position;
-      const coreEvent = createCoreData(this, x, y);
+      const coreEvent = createCoreData(this, x, y); // Call event handler
+
+      const shouldContinue = this.props.onStop(e, coreEvent);
+      if (shouldContinue === false || this.mounted === false) return false;
       const thisNode = ReactDOM.findDOMNode(this);
 
       if (thisNode) {
@@ -7849,9 +7861,7 @@ class DraggableCore extends React__default.Component {
         dragging: false,
         lastX: NaN,
         lastY: NaN
-      }); // Call event handler
+      });
-
-      this.props.onStop(e, coreEvent);
 
       if (thisNode) {
         removeEvent(thisNode.ownerDocument, dragEventFor.move, this.handleDrag);
@@ -7883,9 +7893,23 @@ class DraggableCore extends React__default.Component {
     });
   }
 
+  componentDidMount() {
+    this.mounted = true; // Touch handlers must be added with {passive: false} to be cancelable.
+    // https://developers.google.com/web/updates/2017/01/scrolling-intervention
+
+    const thisNode = ReactDOM.findDOMNode(this);
+
+    if (thisNode) {
+      addEvent(thisNode, eventsFor.touch.start, this.onTouchStart, {
+        passive: false
+      });
+    }
+  }
+
   componentWillUnmount() {
-    // Remove any leftover event handlers. Remove both touch and mouse handlers in case
+    this.mounted = false; // Remove any leftover event handlers. Remove both touch and mouse handlers in case
     // some browser quirk caused a touch event to fire during a mouse move, or vice versa.
+
     const thisNode = ReactDOM.findDOMNode(this);
 
     if (thisNode) {
@@ -7896,6 +7920,9 @@ class DraggableCore extends React__default.Component {
       removeEvent(ownerDocument, eventsFor.touch.move, this.handleDrag);
       removeEvent(ownerDocument, eventsFor.mouse.stop, this.handleDragStop);
       removeEvent(ownerDocument, eventsFor.touch.stop, this.handleDragStop);
+      removeEvent(thisNode, eventsFor.touch.start, this.onTouchStart, {
+        passive: false
+      });
       if (this.props.enableUserSelectHack) removeUserSelectStyles(ownerDocument);
     }
   }
@@ -7904,12 +7931,13 @@ class DraggableCore extends React__default.Component {
     // Reuse the child provided
     // This makes it flexible to use whatever element is wanted (div, ul, etc)
     return React__default.cloneElement(React__default.Children.only(this.props.children), {
-      style: styleHacks(this.props.children.props.style),
       // Note: mouseMove handler is attached to document so it will still function
       // when the user drags quickly and leaves the bounds of the element.
       onMouseDown: this.onMouseDown,
-      onTouchStart: this.onTouchStart,
       onMouseUp: this.onMouseUp,
+      // onTouchStart is added on `componentDidMount` so they can be added with
+      // {passive: false}, which allows it to cancel. See 
+      // https://developers.google.com/web/updates/2017/01/scrolling-intervention
       onTouchEnd: this.onTouchEnd
     });
   }
@@ -8089,7 +8117,9 @@ function _defineProperty$2(obj, key, value) { if (key in obj) { Object.definePro
 //
 // Define <Draggable>
 //
-class Draggable extends React__default.Component {
+class Draggable extends React__default.Component
+/*:: <DraggableProps, DraggableState>*/
+{
   // React 16.3+
   // Arity (props, state)
   static getDerivedStateFromProps({
@@ -8174,8 +8204,8 @@ class Draggable extends React__default.Component {
     _defineProperty$2(this, "onDragStop", (e, coreData) => {
       if (!this.state.dragging) return false; // Short-circuit if user's callback killed it.
 
-      const shouldStop = this.props.onStop(e, createDraggableData(this, coreData));
+      const shouldContinue = this.props.onStop(e, createDraggableData(this, coreData));
-      if (shouldStop === false) return false;
+      if (shouldContinue === false) return false;
       const newState
       /*: $Shape<DraggableState>*/
       = {
@@ -8283,7 +8313,7 @@ class Draggable extends React__default.Component {
     }); // Reuse the child provided
     // This makes it flexible to use whatever element is wanted (div, ul, etc)
 
-    return React__default.createElement(DraggableCore, _extends$1({}, draggableCoreProps, {
+    return /*#__PURE__*/React__default.createElement(DraggableCore, _extends$1({}, draggableCoreProps, {
       onStart: this.onDragStart,
       onDrag: this.onDrag,
       onStop: this.onDragStop

dist/ReactFlow.js

@@ -7209,17 +7209,21 @@ function addEvent(el
 /*: string*/
 , handler
 /*: Function*/
+, inputOptions
+/*: Object*/
 )
 /*: void*/
 {
-  if (!el) {
+  if (!el) return;
-    return;
+  const options = {
-  }
+    capture: true,
+    ...inputOptions
+  };
 
-  if (el.attachEvent) {
+  if (el.addEventListener) {
+    el.addEventListener(event, handler, options);
+  } else if (el.attachEvent) {
     el.attachEvent('on' + event, handler);
-  } else if (el.addEventListener) {
-    el.addEventListener(event, handler, true);
   } else {
     // $FlowIgnore: Doesn't think elements are indexable
     el['on' + event] = handler;
@@ -7231,17 +7235,21 @@ function removeEvent(el
 /*: string*/
 , handler
 /*: Function*/
+, inputOptions
+/*: Object*/
 )
 /*: void*/
 {
-  if (!el) {
+  if (!el) return;
-    return;
+  const options = {
-  }
+    capture: true,
+    ...inputOptions
+  };
 
-  if (el.detachEvent) {
+  if (el.removeEventListener) {
+    el.removeEventListener(event, handler, options);
+  } else if (el.detachEvent) {
     el.detachEvent('on' + event, handler);
-  } else if (el.removeEventListener) {
-    el.removeEventListener(event, handler, true);
   } else {
     // $FlowIgnore: Doesn't think elements are indexable
     el['on' + event] = null;
@@ -7402,30 +7410,26 @@ function addUserSelectStyles(doc
 function removeUserSelectStyles(doc
 /*: ?Document*/
 ) {
+  if (!doc) return;
+
   try {
-    if (doc && doc.body) removeClassName(doc.body, 'react-draggable-transparent-selection'); // $FlowIgnore: IE
+    if (doc.body) removeClassName(doc.body, 'react-draggable-transparent-selection'); // $FlowIgnore: IE
 
     if (doc.selection) {
       // $FlowIgnore: IE
       doc.selection.empty();
     } else {
-      window.getSelection().removeAllRanges(); // remove selection caused by scroll
+      // Remove selection caused by scroll, unless it's a focused input
+      // (we use doc.defaultView in case we're in an iframe)
+      const selection = (doc.defaultView || window).getSelection();
+
+      if (selection && selection.type !== 'Caret') {
+        selection.removeAllRanges();
+      }
     }
   } catch (e) {// probably IE
   }
 }
-function styleHacks(childStyle
-/*: Object*/
-= {})
-/*: Object*/
-{
-  // Workaround IE pointer events; see #51
-  // https://github.com/mzabriskie/react-draggable/issues/51#issuecomment-103488278
-  return {
-    touchAction: 'none',
-    ...childStyle
-  };
-}
 function addClassName(el
 /*: HTMLElement*/
 , className
@@ -7715,7 +7719,9 @@ let dragEventFor = eventsFor.mouse;
 // <DraggableCore> is for advanced usage of <Draggable>. It maintains minimal internal state so it can
 // work well with libraries that require more control over the element.
 //
-class DraggableCore extends React__default.Component {
+class DraggableCore extends React__default.Component
+/*:: <DraggableCoreProps, DraggableCoreState>*/
+{
   constructor(...args) {
     super(...args);
 
@@ -7727,6 +7733,8 @@ class DraggableCore extends React__default.Component {
       touchIdentifier: null
     });
 
+    _defineProperty$1(this, "mounted", false);
+
     _defineProperty$1(this, "handleDragStart", e => {
       // Make it possible to attach event handlers on top of this one.
       this.props.onMouseDown(e); // Only accept left-clicks.
@@ -7745,11 +7753,14 @@ class DraggableCore extends React__default.Component {
 
       if (this.props.disabled || !(e.target instanceof ownerDocument.defaultView.Node) || this.props.handle && !matchesSelectorAndParentsTo(e.target, this.props.handle, thisNode) || this.props.cancel && matchesSelectorAndParentsTo(e.target, this.props.cancel, thisNode)) {
         return;
-      } // Set touch identifier in component state if this is a touch event. This allows us to
+      } // Prevent scrolling on mobile devices, like ipad/iphone.
+      // Important that this is after handle/cancel.
+
+
+      if (e.type === 'touchstart') e.preventDefault(); // Set touch identifier in component state if this is a touch event. This allows us to
       // distinguish between individual touches on multitouch screens by identifying which
       // touchpoint was set to this element.
 
-
       const touchIdentifier = getTouchIdentifier(e);
       this.setState({
         touchIdentifier
@@ -7767,7 +7778,7 @@ class DraggableCore extends React__default.Component {
 
       log('calling', this.props.onStart);
       const shouldUpdate = this.props.onStart(e, coreEvent);
-      if (shouldUpdate === false) return; // Add a style to the body to disable user-select. This prevents text from
+      if (shouldUpdate === false || this.mounted === false) return; // Add a style to the body to disable user-select. This prevents text from
       // being selected all over the page.
 
       if (this.props.enableUserSelectHack) addUserSelectStyles(ownerDocument); // Initiate dragging. Set the current x and y as offsets
@@ -7787,9 +7798,7 @@ class DraggableCore extends React__default.Component {
     });
 
     _defineProperty$1(this, "handleDrag", e => {
-      // Prevent scrolling on mobile devices, like ipad/iphone.
+      // Get the current drag point from the event. This is used as the offset.
-      if (e.type === 'touchmove') e.preventDefault(); // Get the current drag point from the event. This is used as the offset.
-
       const position = getControlPosition(e, this.state.touchIdentifier, this);
       if (position == null) return;
       let {
@@ -7810,7 +7819,7 @@ class DraggableCore extends React__default.Component {
 
       const shouldUpdate = this.props.onDrag(e, coreEvent);
 
-      if (shouldUpdate === false) {
+      if (shouldUpdate === false || this.mounted === false) {
         try {
           // $FlowIgnore
           this.handleDragStop(new MouseEvent('mouseup'));
@@ -7844,7 +7853,10 @@ class DraggableCore extends React__default.Component {
         x,
         y
       } = position;
-      const coreEvent = createCoreData(this, x, y);
+      const coreEvent = createCoreData(this, x, y); // Call event handler
+
+      const shouldContinue = this.props.onStop(e, coreEvent);
+      if (shouldContinue === false || this.mounted === false) return false;
       const thisNode = ReactDOM.findDOMNode(this);
 
       if (thisNode) {
@@ -7856,9 +7868,7 @@ class DraggableCore extends React__default.Component {
         dragging: false,
         lastX: NaN,
         lastY: NaN
-      }); // Call event handler
+      });
-
-      this.props.onStop(e, coreEvent);
 
       if (thisNode) {
         removeEvent(thisNode.ownerDocument, dragEventFor.move, this.handleDrag);
@@ -7890,9 +7900,23 @@ class DraggableCore extends React__default.Component {
     });
   }
 
+  componentDidMount() {
+    this.mounted = true; // Touch handlers must be added with {passive: false} to be cancelable.
+    // https://developers.google.com/web/updates/2017/01/scrolling-intervention
+
+    const thisNode = ReactDOM.findDOMNode(this);
+
+    if (thisNode) {
+      addEvent(thisNode, eventsFor.touch.start, this.onTouchStart, {
+        passive: false
+      });
+    }
+  }
+
   componentWillUnmount() {
-    // Remove any leftover event handlers. Remove both touch and mouse handlers in case
+    this.mounted = false; // Remove any leftover event handlers. Remove both touch and mouse handlers in case
     // some browser quirk caused a touch event to fire during a mouse move, or vice versa.
+
     const thisNode = ReactDOM.findDOMNode(this);
 
     if (thisNode) {
@@ -7903,6 +7927,9 @@ class DraggableCore extends React__default.Component {
       removeEvent(ownerDocument, eventsFor.touch.move, this.handleDrag);
       removeEvent(ownerDocument, eventsFor.mouse.stop, this.handleDragStop);
       removeEvent(ownerDocument, eventsFor.touch.stop, this.handleDragStop);
+      removeEvent(thisNode, eventsFor.touch.start, this.onTouchStart, {
+        passive: false
+      });
       if (this.props.enableUserSelectHack) removeUserSelectStyles(ownerDocument);
     }
   }
@@ -7911,12 +7938,13 @@ class DraggableCore extends React__default.Component {
     // Reuse the child provided
     // This makes it flexible to use whatever element is wanted (div, ul, etc)
     return React__default.cloneElement(React__default.Children.only(this.props.children), {
-      style: styleHacks(this.props.children.props.style),
       // Note: mouseMove handler is attached to document so it will still function
       // when the user drags quickly and leaves the bounds of the element.
       onMouseDown: this.onMouseDown,
-      onTouchStart: this.onTouchStart,
       onMouseUp: this.onMouseUp,
+      // onTouchStart is added on `componentDidMount` so they can be added with
+      // {passive: false}, which allows it to cancel. See 
+      // https://developers.google.com/web/updates/2017/01/scrolling-intervention
       onTouchEnd: this.onTouchEnd
     });
   }
@@ -8096,7 +8124,9 @@ function _defineProperty$2(obj, key, value) { if (key in obj) { Object.definePro
 //
 // Define <Draggable>
 //
-class Draggable extends React__default.Component {
+class Draggable extends React__default.Component
+/*:: <DraggableProps, DraggableState>*/
+{
   // React 16.3+
   // Arity (props, state)
   static getDerivedStateFromProps({
@@ -8181,8 +8211,8 @@ class Draggable extends React__default.Component {
     _defineProperty$2(this, "onDragStop", (e, coreData) => {
       if (!this.state.dragging) return false; // Short-circuit if user's callback killed it.
 
-      const shouldStop = this.props.onStop(e, createDraggableData(this, coreData));
+      const shouldContinue = this.props.onStop(e, createDraggableData(this, coreData));
-      if (shouldStop === false) return false;
+      if (shouldContinue === false) return false;
       const newState
       /*: $Shape<DraggableState>*/
       = {
@@ -8290,7 +8320,7 @@ class Draggable extends React__default.Component {
     }); // Reuse the child provided
     // This makes it flexible to use whatever element is wanted (div, ul, etc)
 
-    return React__default.createElement(DraggableCore, _extends$1({}, draggableCoreProps, {
+    return /*#__PURE__*/React__default.createElement(DraggableCore, _extends$1({}, draggableCoreProps, {
       onStart: this.onDragStart,
       onDrag: this.onDrag,
       onStop: this.onDragStop

example/package-lock.json

@@ -10957,7 +10957,7 @@
         "d3-zoom": "^1.8.3",
         "easy-peasy": "^3.3.0",
         "fast-deep-equal": "^3.1.1",
-        "react-draggable": "^4.2.0",
+        "react-draggable": "^4.3.1",
         "resize-observer": "^1.0.0",
         "scheduler": "^0.19.1"
       }

example/src/index.css

@@ -1,5 +1,8 @@
+@import url('https://fonts.googleapis.com/css2?family=Roboto@1,400;1,700&display=swap');
+
 body {
-  font-family: sans-serif;
+  font-family: 'Roboto', sans-serif;
+  color: #111;
 }
 
 html, body {
@@ -9,3 +12,52 @@ html, body {
 html, body, #root {
   height: 100%;
 }
+
+#root {
+  display: flex;
+  flex-direction: column;
+}
+
+header {
+  padding: 10px;
+  border-bottom: 1px solid #eee;
+  display: flex;
+  font-weight: 700;
+}
+
+header nav {
+  font-weight: 400;
+  margin-left: auto;
+}
+
+nav a {
+  margin-left: 10px;
+  text-decoration: none;
+  font-size: 12px;
+  background: rgb(255, 96, 96);
+  color: white;
+  padding: 5px 12px;
+  border-radius: 5px;
+  position: relative;
+}
+
+nav a, nav a:focus, nav a:active {
+  color: #fff;
+}
+
+nav a:hover {
+  color: #fff;
+  box-shadow: 0 0 4px 1px rgba(0, 0, 0, 0.12);
+}
+
+nav a.active:before {
+  content: '';
+  position: absolute;
+  width: 6px;
+  height: 6px;
+  background: white;
+  opacity: 0.5;
+  left:0;
+  top:50%;
+  transform: translateY(-50%);
+}

example/src/index.js

@@ -1,37 +1,59 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
+import { BrowserRouter as Router, Route, Switch, NavLink } from 'react-router-dom';
 
-import CustomNode from './CustomNode';
 import Rich from './Rich';
 import Basic from './Basic';
-import Empty from './Empty';
+import CustomNode from './CustomNode';
-import Inactive from './Inactive';
 import Stress from './Stress';
+import Inactive from './Inactive';
+import Empty from './Empty';
 
 import './index.css';
 
+const routes = [{
+  path: '/',
+  component: Rich,
+  label: 'Rich'
+}, {
+  path: '/basic',
+  component: Basic,
+  label: 'Basic'
+},{
+  path: '/custom-node',
+  component: CustomNode,
+  label: 'CustomNode'
+}, {
+  path: '/stress',
+  component: Stress,
+  label: 'StressTest'
+}, {
+  path: '/empty',
+  component: Empty
+},{
+  path: '/inactive',
+  component: Inactive
+}];
+
+const navLinks = routes.filter(route => route.label);
+
 ReactDOM.render((
-  <Router>
+  <Router forceRefresh={true}>
+    <header>
+      <div>React Flow Examples</div>
+      <nav>
+        {navLinks.map(route => (
+          <NavLink to={route.path} key={route.label} exact>
+            {route.label}
+          </NavLink>
+        ))}
+      </nav>
+    </header>
     <Switch>
-      <Route path="/basic">
+      {routes.map(route => (
-        <Basic />
+        <Route exact path={route.path} render={() => <route.component />} key={route.path} />
-      </Route>
+      ))}
-      <Route path="/empty">
-        <Empty />
-      </Route>
-      <Route path="/inactive">
-        <Inactive />
-      </Route>
-      <Route path="/custom-node">
-        <CustomNode />
-      </Route>
-      <Route path="/stress">
-        <Stress />
-      </Route>
-      <Route path="/">
-        <Rich />
-      </Route>
     </Switch>
   </Router>
 ), document.getElementById('root'));
+