poi-plugin-ship-info - npm Package Compare versions

Comparing version 3.0.1 to 3.0.2

package.json

 {
   "name": "poi-plugin-ship-info",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Show detailed information of all owned ship girls",
@@ -5,0 +5,0 @@ "main": "index.es",

views/settings-view/bookmark-dropdown.js

@@ -94,3 +94,3 @@ 'use strict';
       'ul',
-      { className: 'dropdown-menu pull-right' },
+      { className: 'dropdown-menu' },
       _react2.default.createElement(
@@ -97,0 +97,0 @@ 'li',

views/settings-view/config-dropdown.js

@@ -27,2 +27,6 @@ 'use strict';
 
+var _typeView = require('./type-view');
+
+var _typeView2 = _interopRequireDefault(_typeView);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -32,2 +36,80 @@
 
+const ConfigView = () => _react2.default.createElement(
+  'div',
+  { className: 'config-menu' },
+  _react2.default.createElement(
+    'div',
+    { className: 'dual-col' },
+    _react2.default.createElement(_radioCheck2.default, {
+      configKey: 'lvRadio',
+      label: 'Level',
+      options: _constants.lvOptions,
+      'default': 2
+    }),
+    _react2.default.createElement(_radioCheck2.default, {
+      configKey: 'lockedRadio',
+      label: 'Lock',
+      options: _constants.lockedOptions,
+      'default': 1
+    }),
+    _react2.default.createElement(_radioCheck2.default, {
+      configKey: 'expeditionRadio',
+      label: 'Expedition',
+      options: _constants.expeditionOptions,
+      'default': 0
+    }),
+    _react2.default.createElement(_radioCheck2.default, {
+      configKey: 'inFleetRadio',
+      label: 'In Fleet',
+      options: _constants.inFleetOptions,
+      'default': 0
+    }),
+    _react2.default.createElement(_radioCheck2.default, {
+      configKey: 'modernizationRadio',
+      label: 'Modernization',
+      options: _constants.modernizationOptions,
+      'default': 0
+    }),
+    _react2.default.createElement(_radioCheck2.default, {
+      configKey: 'remodelRadio',
+      label: 'Remodelable',
+      options: _constants.remodelOptions,
+      'default': 0
+    }),
+    _react2.default.createElement(_radioCheck2.default, {
+      configKey: 'sparkleRadio',
+      label: 'Sparkle',
+      options: _constants.sparkleOptions,
+      'default': 0
+    }),
+    _react2.default.createElement(_radioCheck2.default, {
+      configKey: 'exSlotRadio',
+      label: 'Extra Slot',
+      options: _constants.exSlotOptions,
+      'default': 0
+    }),
+    _react2.default.createElement(_radioCheck2.default, {
+      configKey: 'daihatsuRadio',
+      label: 'Daihatsu',
+      options: _constants.daihatsuOptions,
+      'default': 0
+    })
+  ),
+  _react2.default.createElement(
+    'div',
+    { className: 'single-col' },
+    _react2.default.createElement(_sallyAreaCheck2.default, null)
+  ),
+  _react2.default.createElement(
+    'div',
+    { className: 'dual-col' },
+    _react2.default.createElement(_radioCheck2.default, {
+      configKey: 'rawValue',
+      label: 'Value Type',
+      options: _constants.rawValueOptions,
+      'default': 0
+    })
+  )
+);
+
 // dropdown menu should accept a ref, we cannot use the stateless component
@@ -37,97 +119,8 @@ class ConfigMenu extends _react.PureComponent {
 
-  componentDidUpdate() {
-    const typeButton = document.querySelector('#type-dropdown');
-    if (!typeButton) {
-      return;
-    }
-    const { width } = typeButton.getBoundingClientRect();
-    if (this.menu && this.left !== width) {
-      this.menu.style.left = `-${width}px`;
-      this.left = width;
-    }
-  }
-
   render() {
     return _react2.default.createElement(
       'ul',
-      { className: 'dropdown-menu', ref: ref => {
-          this.menu = ref;
-        } },
-      _react2.default.createElement(
-        'div',
-        { className: 'config-menu' },
-        _react2.default.createElement(
-          'div',
-          { className: 'dual-col' },
-          _react2.default.createElement(_radioCheck2.default, {
-            configKey: 'lvRadio',
-            label: 'Level',
-            options: _constants.lvOptions,
-            'default': 2
-          }),
-          _react2.default.createElement(_radioCheck2.default, {
-            configKey: 'lockedRadio',
-            label: 'Lock',
-            options: _constants.lockedOptions,
-            'default': 1
-          }),
-          _react2.default.createElement(_radioCheck2.default, {
-            configKey: 'expeditionRadio',
-            label: 'Expedition',
-            options: _constants.expeditionOptions,
-            'default': 0
-          }),
-          _react2.default.createElement(_radioCheck2.default, {
-            configKey: 'inFleetRadio',
-            label: 'In Fleet',
-            options: _constants.inFleetOptions,
-            'default': 0
-          }),
-          _react2.default.createElement(_radioCheck2.default, {
-            configKey: 'modernizationRadio',
-            label: 'Modernization',
-            options: _constants.modernizationOptions,
-            'default': 0
-          }),
-          _react2.default.createElement(_radioCheck2.default, {
-            configKey: 'remodelRadio',
-            label: 'Remodelable',
-            options: _constants.remodelOptions,
-            'default': 0
-          }),
-          _react2.default.createElement(_radioCheck2.default, {
-            configKey: 'sparkleRadio',
-            label: 'Sparkle',
-            options: _constants.sparkleOptions,
-            'default': 0
-          }),
-          _react2.default.createElement(_radioCheck2.default, {
-            configKey: 'exSlotRadio',
-            label: 'Extra Slot',
-            options: _constants.exSlotOptions,
-            'default': 0
-          }),
-          _react2.default.createElement(_radioCheck2.default, {
-            configKey: 'daihatsuRadio',
-            label: 'Daihatsu',
-            options: _constants.daihatsuOptions,
-            'default': 0
-          })
-        ),
-        _react2.default.createElement(
-          'div',
-          { className: 'single-col' },
-          _react2.default.createElement(_sallyAreaCheck2.default, null)
-        ),
-        _react2.default.createElement(
-          'div',
-          { className: 'dual-col' },
-          _react2.default.createElement(_radioCheck2.default, {
-            configKey: 'rawValue',
-            label: 'Value Type',
-            options: _constants.rawValueOptions,
-            'default': 0
-          })
-        )
-      )
+      { className: 'dropdown-menu' },
+      _react2.default.createElement(_typeView2.default, null),
+      _react2.default.createElement(ConfigView, null)
     );
@@ -134,0 +127,0 @@ }

views/settings-view/index.js

@@ -13,6 +13,2 @@ 'use strict';
 
-var _typeDropdown = require('./type-dropdown');
-
-var _typeDropdown2 = _interopRequireDefault(_typeDropdown);
-
 var _bookmarkDropdown = require('./bookmark-dropdown');
@@ -56,3 +52,2 @@
           null,
-          _react2.default.createElement(_typeDropdown2.default, null),
           _react2.default.createElement(_configDropdown2.default, null)
@@ -59,0 +54,0 @@ ),

views/table-view/index.js

@@ -29,4 +29,2 @@ 'use strict';
 
-var _electron = require('electron');
-
 var _divider = require('../divider');
@@ -115,7 +113,3 @@
     this.updateWindowWidth = (0, _lodash.debounce)(this.updateWindowWidth, 500);
-    this.handleScroll = (0, _lodash.debounce)(this.handleScroll, 200);
     this.setRef = this.setRef.bind(this);
-    this.webContent = _electron.remote.getCurrentWebContents();
-    this.rowStopIndex = 0;
-    this.columnStopIndex = 0;
   }
@@ -133,3 +127,3 @@
         'div',
-        { style: { flex: 1 }, className: 'table-container', onMouseLeave: this.handleMouseLeave },
+        { style: { flex: 1 }, className: 'table-container' },
         _react2.default.createElement(
@@ -153,3 +147,2 @@ _reactVirtualized.AutoSizer,
             overscanRowCount: 10,
-            onScroll: this.handleScroll,
             cellRenderer: this.cellRenderer,
@@ -196,14 +189,2 @@ rowCount: rows.length + 1,
 
-  this.handleScroll = () => {
-    if (this.activeColumn === -1 || this.activeRow === -1) {
-      return;
-    }
-    const zf = config.get('poi.zoomLevel', 1);
-    this.webContent.sendInputEvent({
-      type: 'mouseMove',
-      x: (0, _lodash.floor)(this.mouseX * zf),
-      y: (0, _lodash.floor)(this.mouseY * zf)
-    });
-  };
-
   this.updateWindowWidth = () => {
@@ -247,8 +228,8 @@ this.setState({
     const setState = this.setState.bind(this);
-    const onMouseEnter = e => {
-      this.mouseX = e.clientX;
-      this.mouseY = e.clientY;
+    const onClick = () => {
+      const { activeColumn, activeRow } = this.state;
+      const off = activeColumn === columnIndex && activeRow === rowIndex;
       setState({
-        activeColumn: columnIndex,
-        activeRow: rowIndex
+        activeColumn: off ? -1 : columnIndex,
+        activeRow: off ? -1 : rowIndex
       });
@@ -259,3 +240,3 @@ };
       key,
-      onMouseEnter,
+      onClick,
       className: (0, _classnames2.default)({
@@ -286,9 +267,2 @@ 'ship-info-cell': true,
 
-  this.handleMouseLeave = () => {
-    this.setState({
-      activeColumn: -1,
-      activeRow: -1
-    });
-  };
-
   this.handleContentRendered = e => {
@@ -295,0 +269,0 @@ const { rowStopIndex, columnStopIndex } = e;

No alert changes

Worsened metrics

Total package byte prevSize

234104

decreased by-2.26%

Lines of code

2901

decreased by-1.66%

No dependency changes