small fixes (#392)

Author: nicolaskruchten

src/components/fields/derived.js

@@ -289,6 +289,9 @@ export const LayoutNumericFractionInverse = connectLayoutToPlot(
 
 export const AnnotationArrowRef = connectToContainer(UnconnectedDropdown, {
   modifyPlotProps: (props, context, plotProps) => {
+    if (!context.fullContainer) {
+      return;
+    }
     const {fullContainer: {xref, yref}} = context;
 
     let currentAxisRef;
@@ -325,6 +328,9 @@ export const AnnotationArrowRef = connectToContainer(UnconnectedDropdown, {
 
 export const AnnotationRef = connectToContainer(UnconnectedDropdown, {
   modifyPlotProps: (props, context, plotProps) => {
+    if (!context.fullContainer) {
+      return;
+    }
     const {fullContainer: {axref, ayref}} = context;
 
     let currentOffsetRef;

src/components/widgets/EditableText.js

@@ -13,6 +13,7 @@ class EditableText extends Component {
     this.handleChange = this.handleChange.bind(this);
     this.handleUpdate = this.handleUpdate.bind(this);
     this.handleKeyPress = this.handleKeyPress.bind(this);
+    this.handleWheel = this.handleWheel.bind(this);
     this.getRef = this.getRef.bind(this);
   }
 
@@ -48,6 +49,12 @@ class EditableText extends Component {
     }
   }
 
+  handleWheel(event) {
+    if (this.props.onWheel && document.activeElement === this._ref) {
+      this.props.onWheel(event);
+    }
+  }
+
   render() {
     const {
       type,
@@ -57,7 +64,6 @@ class EditableText extends Component {
       autoFocus,
       onKeyDown,
       placeholder,
-      onWheel,
       readOnly,
       size,
     } = this.props;
@@ -74,7 +80,7 @@ class EditableText extends Component {
         autoFocus={autoFocus}
         onKeyPress={this.handleKeyPress}
         onKeyDown={onKeyDown}
-        onWheel={onWheel}
+        onWheel={this.handleWheel}
         placeholder={placeholder}
         readOnly={readOnly}
         size={size}

src/components/widgets/NumericInput.js

@@ -39,12 +39,13 @@ export default class NumericInput extends Component {
   }
 
   onWheel(e) {
+    e.stopPropagation();
+    e.preventDefault();
     if (e.deltaY > 0) {
       this.incrementValue('increase');
     } else {
       this.incrementValue('decrease');
     }
-    e.stopPropagation();
   }
 
   onChange(value) {