grape-browser - npm Package Compare versions

Comparing version 2.6.2 to 2.7.0-pre.2

lib/components/app/GrapeBrowser.js

@@ -91,5 +91,5 @@ 'use strict';
 
-var _globalEventGlobalEvent = require('../global-event/GlobalEvent');
+var _grapeWebLibGlobalEventGlobalEvent = require('grape-web/lib/global-event/GlobalEvent');
 
-var _globalEventGlobalEvent2 = _interopRequireDefault(_globalEventGlobalEvent);
+var _grapeWebLibGlobalEventGlobalEvent2 = _interopRequireDefault(_grapeWebLibGlobalEventGlobalEvent);
 
@@ -133,3 +133,7 @@ var _emoji = require('../emoji');
       placeholder: _react.PropTypes.string,
-      ignoreSuggest: _react.PropTypes.bool,
+      // Ignore trigger is used to avoid showing suggestions or search when trigger
+      // was inserted.
+      // 1. when showing emoji browser instead of emoji suggest
+      // 2. when switching betwen rooms and trigger is inside of text content
+      ignoreTrigger: _react.PropTypes.bool,
       setTrigger: _react.PropTypes.bool,
@@ -163,3 +167,3 @@ disabled: _react.PropTypes.bool,
       disabled: false,
-      ignoreSuggest: false,
+      ignoreTrigger: false,
       setTrigger: false,
@@ -203,7 +207,4 @@ isLoading: false,
 
-      var ignoreSuggest = this.state.ignoreSuggest;
-
-      var isEmojiSuggest = nextProps.browser === 'emojiSuggest';
-      if (ignoreSuggest && isEmojiSuggest) {
-        this.setState({ ignoreSuggest: false });
+      if (this.state.ignoreTrigger) {
+        this.setState({ ignoreTrigger: false });
         return;
@@ -433,3 +434,3 @@ }
       this.query.reset();
-      this.setState({ content: content }, function () {
+      this.setState({ content: content, ignoreTrigger: true }, function () {
         if (!options.silent) _this7.onChangeInput();
@@ -453,3 +454,3 @@ });
     value: function createState(nextProps) {
-      var state = (0, _lodashObjectPick2['default'])(nextProps, 'browser', 'data', 'isLoading', 'ignoreSuggest');
+      var state = (0, _lodashObjectPick2['default'])(nextProps, 'browser', 'data', 'isLoading', 'ignoreTrigger');
 
@@ -614,3 +615,3 @@ if (state.browser === 'user') {
           'data-test': 'grape-browser' },
-        _react2['default'].createElement(_globalEventGlobalEvent2['default'], { event: 'blur', handler: this.onBlurWindow.bind(this) }),
+        _react2['default'].createElement(_grapeWebLibGlobalEventGlobalEvent2['default'], { event: 'blur', handler: this.onBlurWindow.bind(this) }),
         this.renderBrowser(),
@@ -617,0 +618,0 @@ _react2['default'].createElement(

lib/components/emoji-browser/Browser.js

@@ -87,5 +87,5 @@ 'use strict';
 
-var _globalEventGlobalEvent = require('../global-event/GlobalEvent');
+var _grapeWebLibGlobalEventGlobalEvent = require('grape-web/lib/global-event/GlobalEvent');
 
-var _globalEventGlobalEvent2 = _interopRequireDefault(_globalEventGlobalEvent);
+var _grapeWebLibGlobalEventGlobalEvent2 = _interopRequireDefault(_grapeWebLibGlobalEventGlobalEvent);
 
@@ -404,3 +404,3 @@ var PUBLIC_METHODS = ['focusItem', 'getFocusedItem'];
           onMouseDown: this.onMouseDown.bind(this) },
-        _react2['default'].createElement(_globalEventGlobalEvent2['default'], {
+        _react2['default'].createElement(_grapeWebLibGlobalEventGlobalEvent2['default'], {
           event: 'resize',
@@ -407,0 +407,0 @@ handler: this.onResize.bind(this),

lib/components/grape-input/GrapeInput.js

@@ -51,5 +51,5 @@ 'use strict';
 
-var _globalEventGlobalEvent = require('../global-event/GlobalEvent');
+var _grapeWebLibGlobalEventGlobalEvent = require('grape-web/lib/global-event/GlobalEvent');
 
-var _globalEventGlobalEvent2 = _interopRequireDefault(_globalEventGlobalEvent);
+var _grapeWebLibGlobalEventGlobalEvent2 = _interopRequireDefault(_grapeWebLibGlobalEventGlobalEvent);
 
@@ -273,3 +273,3 @@ var _highlightedInputHighlightedInput = require('../highlighted-input/HighlightedInput');
           onSubmit: this.onSubmit.bind(this) })),
-        _react2['default'].createElement(_globalEventGlobalEvent2['default'], { event: 'resize', handler: this.onResizeWindow.bind(this) })
+        _react2['default'].createElement(_grapeWebLibGlobalEventGlobalEvent2['default'], { event: 'resize', handler: this.onResizeWindow.bind(this) })
       );
@@ -276,0 +276,0 @@ }

package.json

 {
   "name": "grape-browser",
-  "version": "2.6.2",
+  "version": "2.7.0-pre.2",
   "main": "lib/index.js",
@@ -13,3 +13,3 @@ "engines": {
     "grape-theme": "^1.2.0",
-    "grape-web": "0.19.2",
+    "grape-web": "0.19.3",
     "images-loader": "^0.1.2",
@@ -16,0 +16,0 @@ "grape-js-emoji": "^0.0.1",

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

580895

decreased by-0.59%

Number of package files

130

decreased by-0.76%

Lines of code

12761

decreased by-0.57%

Number of low quality alerts

2

increased by100%

Dependency changes

• + Addedgrape-web@0.19.3(transitive)

• - Removedgrape-web@0.19.2(transitive)

• Updatedgrape-web@0.19.3