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

Comparing version 4.2.1 to 4.2.2

package.json

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

views/selectors.js

@@ -6,3 +6,3 @@ 'use strict';
 });
-exports.deckPlannerShipMapSelector = exports.deckPlannerAllShipIdsSelector = exports.deckPlannerAreaSelectorFactory = exports.deckPlannerCurrentSelector = exports.shipMenuDataSelector = exports.ShipItemSelectorFactory = exports.sallyAreaSelectorFactory = exports.shipRowsSelector = exports.allShipRowsSelector = exports.shipTableDataSelectorFactory = exports.shipFleetIdMapSelector = exports.shipInfoConfigSelector = undefined;
+exports.deckPlannerShipMapSelector = exports.deckPlannerAllShipIdsSelector = exports.deckPlannerAreaSelectorFactory = exports.deckPlannerCurrentSelector = exports.shipMenuDataSelector = exports.ShipItemSelectorFactory = exports.sallyAreaSelectorFactory = exports.shipRowsSelector = exports.allShipRowsSelector = exports.shipTableDataSelectorFactory = exports.shipFleetIdSelectorFactory = exports.shipFleetIdMapSelector = exports.shipInfoConfigSelector = undefined;
 
@@ -53,2 +53,4 @@ var _fastMemoize = require('fast-memoize');
 
+const shipFleetIdSelectorFactory = exports.shipFleetIdSelectorFactory = (0, _fastMemoize2.default)(shipId => (0, _reselect.createSelector)([shipFleetIdMapSelector], fleetIdMap => fleetIdMap[shipId]));
+
 const shipTableDataSelectorFactory = exports.shipTableDataSelectorFactory = (0, _fastMemoize2.default)(shipId => (0, _reselect.createSelector)([(0, _selectors.shipDataSelectorFactory)(shipId), (0, _selectors.shipEquipDataSelectorFactory)(shipId), _selectors.constSelector, shipFleetIdMapSelector, _selectors.configSelector, _selectors.inRepairShipsIdSelector], ([ship, $ship] = [], equips, { $shipTypes }, fleetIdMap, config, repairs = []) => (0, _utils.getShipInfoData)(ship, $ship, equips, $shipTypes, fleetIdMap, (0, _lodash.get)(config, 'plugin.ShipInfo.rawValue', false), repairs)));
@@ -55,0 +57,0 @@

views/settings-view/planner-dropdown/area.js

@@ -33,2 +33,6 @@ 'use strict';
 
+var _path = require('path');
+
+var _path2 = _interopRequireDefault(_path);
+
 var _redux = require('../../redux');
@@ -73,3 +77,4 @@
 const ShipChip = (0, _reactRedux.connect)((state, props) => _extends({}, (0, _selectors.ShipItemSelectorFactory)(props.shipId)(state), {
-  color: (0, _lodash.get)(state, 'fcd.shiptag.color', [])
+  color: (0, _lodash.get)(state, 'fcd.shiptag.color', []),
+  fleetId: (0, _selectors.shipFleetIdSelectorFactory)(props.shipId)(state)
 }))((_temp2 = _class = class ShipChip extends _react.PureComponent {
@@ -112,3 +117,3 @@
   render() {
-    const { id, typeId, name, lv, area, color, others, onRemove, onDisplace } = this.props;
+    const { id, typeId, name, lv, area, color, others, onRemove, onDisplace, fleetId } = this.props;
     const { hover } = this.state;
@@ -187,2 +192,12 @@
         null,
+        fleetId > -1 && _react2.default.createElement('img', {
+          className: 'fleet-id-indicator',
+          style: { height: '10px' },
+          alt: `fleet: ${fleetId + 1}`,
+          src: _path2.default.resolve(__dirname, `../../../assets/svg/fleet-indicator-${fleetId + 1}.svg`)
+        })
+      ),
+      _react2.default.createElement(
+        'span',
+        null,
         !(area > 0) && hover && _react2.default.createElement(
@@ -207,3 +222,4 @@ 'a',
   planArea: _propTypes2.default.number,
-  dispatch: _propTypes2.default.func
+  dispatch: _propTypes2.default.func,
+  fleetId: _propTypes2.default.number
 }, _temp2));
@@ -210,0 +226,0 @@

No alert changes

Improved metrics

Total package byte prevSize

388056

increased by0.51%

Lines of code

4854

increased by0.31%

No dependency changes