Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@maslianok
maslianok committed Sep 18, 2019
1 parent ec48178 commit 9b3a679
Show file tree
Hide file tree
Showing 11 changed files with 567 additions and 410 deletions.
2 changes: 2 additions & 0 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
"import/no-named-as-default": 0,
"object-curly-newline": 0,
"jsx-a11y/click-events-have-key-events": 0,
"react/jsx-props-no-spreading": 0,
"max-len": ["error", 120],
"operator-linebreak": ["error", "after"],
"arrow-parens": [
"error",
"as-needed",
Expand Down
4 changes: 3 additions & 1 deletion lib/components/ShowMore.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; return newObj; } }
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; if (obj != null) { var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }

Expand Down
4 changes: 3 additions & 1 deletion lib/components/Tab.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; return newObj; } }
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; if (obj != null) { var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }

Expand Down
4 changes: 3 additions & 1 deletion lib/components/TabPanel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; return newObj; } }
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; if (obj != null) { var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }

Expand Down
14 changes: 8 additions & 6 deletions lib/esm/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }

function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }

function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

Expand Down Expand Up @@ -203,11 +205,11 @@ function (_Component) {
/* eslint-disable no-param-reassign */

if ( // don't need to `Show more` button
!showMore // initial call
|| !blockWidth // collapsed mode
|| collapsed // all tabs are fit into the block
|| blockWidth > tabsTotalWidth // current tab fit into the block
|| availableWidth - tabWidth > 0) {
!showMore || // initial call
!blockWidth || // collapsed mode
collapsed || // all tabs are fit into the block
blockWidth > tabsTotalWidth || // current tab fit into the block
availableWidth - tabWidth > 0) {
result.tabsVisible.push(tabPayload);
} else {
result.tabsHidden.push(tabPayload);
Expand Down
18 changes: 11 additions & 7 deletions lib/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,15 @@ var _InkBar = _interopRequireDefault(require("./components/InkBar"));

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; return newObj; } }
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; if (obj != null) { var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }

function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }

function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

Expand Down Expand Up @@ -223,11 +227,11 @@ function (_Component) {
/* eslint-disable no-param-reassign */

if ( // don't need to `Show more` button
!showMore // initial call
|| !blockWidth // collapsed mode
|| collapsed // all tabs are fit into the block
|| blockWidth > tabsTotalWidth // current tab fit into the block
|| availableWidth - tabWidth > 0) {
!showMore || // initial call
!blockWidth || // collapsed mode
collapsed || // all tabs are fit into the block
blockWidth > tabsTotalWidth || // current tab fit into the block
availableWidth - tabWidth > 0) {
result.tabsVisible.push(tabPayload);
} else {
result.tabsHidden.push(tabPayload);
Expand Down
33 changes: 16 additions & 17 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,26 @@
"classnames": "^2.2.6",
"lodash.throttle": "^4.1.1",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-resize-detector": "^4.1.4"
"react-resize-detector": "^4.2.1"
},
"devDependencies": {
"@babel/cli": "^7.4.4",
"@babel/core": "^7.4.5",
"@babel/plugin-proposal-class-properties": "^7.4.4",
"@babel/preset-env": "^7.4.5",
"@babel/cli": "^7.6.0",
"@babel/core": "^7.6.0",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/preset-env": "^7.6.0",
"@babel/preset-react": "^7.0.0",
"babel-eslint": "^10.0.1",
"babel-eslint": "^10.0.3",
"babel-plugin-module-resolver": "^3.2.0",
"babel-plugin-transform-imports": "^1.5.1",
"cross-env": "^5.2.0",
"eslint": "^5.15.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-plugin-import": "^2.17.3",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-react": "^7.13.0",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"rimraf": "^2.6.3"
"babel-plugin-transform-imports": "^2.0.0",
"cross-env": "^6.0.0",
"eslint": "^6.4.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.14.3",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"rimraf": "^3.0.0"
},
"scripts": {
"build": "npm run build:cjs && npm run build:esm",
Expand Down
17 changes: 6 additions & 11 deletions src/components/ShowMore.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ export default class ShowMore extends Component {
shouldComponentUpdate(nextProps, nextState) {
const { children, isShown, hasChildSelected } = this.props;
return (
children.length !== nextProps.children.length
|| isShown !== nextProps.isShown
|| hasChildSelected !== nextProps.hasChildSelected
|| this.state !== nextState
children.length !== nextProps.children.length ||
isShown !== nextProps.isShown ||
hasChildSelected !== nextProps.hasChildSelected ||
this.state !== nextState
);
}

Expand Down Expand Up @@ -99,9 +99,7 @@ export default class ShowMore extends Component {
onBlur={this.onBlur}
onClick={this.toggleVisibility}
>
<div className={showMoreLabelStyles}>
{label}
</div>
<div className={showMoreLabelStyles}>{label}</div>
<div className={listStyles} aria-hidden={isListHidden} role="menu">
{children}
</div>
Expand All @@ -115,10 +113,7 @@ ShowMore.propTypes = {
hasChildSelected: PropTypes.bool,
isShown: PropTypes.bool.isRequired,
onShowMoreChanged: PropTypes.func,
label: PropTypes.oneOfType([
PropTypes.string,
PropTypes.node,
]),
label: PropTypes.oneOfType([PropTypes.string, PropTypes.node])
};

ShowMore.defaultProps = {
Expand Down
4 changes: 1 addition & 3 deletions src/components/Tab.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ export default class Tab extends Component {
const { children, onRemove } = this.props;
return (
<div className="RRT__removable">
<div className="RRT__removable-text">
{children}
</div>
<div className="RRT__removable-text">{children}</div>
<div className="RRT__removable-icon" onClick={onRemove}>
x
</div>
Expand Down
43 changes: 20 additions & 23 deletions src/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ export default class Tabs extends Component {
const { items, transform, showMore, showInkBar, allowRemove, removeActiveOnly } = this.props;

return (
items !== nextProps.items
|| nextProps.transform !== transform
|| nextProps.showMore !== showMore
|| nextProps.showInkBar !== showInkBar
|| nextProps.allowRemove !== allowRemove
|| nextProps.removeActiveOnly !== removeActiveOnly
|| nextState.blockWidth !== blockWidth
|| nextState.showMoreWidth !== showMoreWidth
|| nextState.selectedTabKey !== selectedTabKey
items !== nextProps.items ||
nextProps.transform !== transform ||
nextProps.showMore !== showMore ||
nextProps.showInkBar !== showInkBar ||
nextProps.allowRemove !== allowRemove ||
nextProps.removeActiveOnly !== removeActiveOnly ||
nextState.blockWidth !== blockWidth ||
nextState.showMoreWidth !== showMoreWidth ||
nextState.selectedTabKey !== selectedTabKey
);
}

Expand Down Expand Up @@ -181,15 +181,15 @@ export default class Tabs extends Component {
/* eslint-disable no-param-reassign */
if (
// don't need to `Show more` button
!showMore
!showMore ||
// initial call
|| !blockWidth
!blockWidth ||
// collapsed mode
|| collapsed
collapsed ||
// all tabs are fit into the block
|| blockWidth > tabsTotalWidth
blockWidth > tabsTotalWidth ||
// current tab fit into the block
|| availableWidth - tabWidth > 0
availableWidth - tabWidth > 0
) {
result.tabsVisible.push(tabPayload);
} else {
Expand Down Expand Up @@ -324,15 +324,15 @@ export default class Tabs extends Component {

{!isCollapsed && (
<ShowMore {...this.getShowMoreProps(showMore, isSelectedTabHidden, showMoreLabel)}>
{tabsHidden.map(tab => <Tab {...this.getTabProps(tab)} />)}
{tabsHidden.map(tab => (
<Tab {...this.getTabProps(tab)} />
))}
</ShowMore>
)}
</div>

{showInkBar
&& !isCollapsed
&& !isSelectedTabHidden && (
<InkBar left={selectedTabDimensions.offset || 0} width={selectedTabDimensions.width || 0} />
{showInkBar && !isCollapsed && !isSelectedTabHidden && (
<InkBar left={selectedTabDimensions.offset || 0} width={selectedTabDimensions.width || 0} />
)}

{!isCollapsed && panels[selectedTabKey] && <TabPanel {...this.getPanelProps(panels[selectedTabKey])} />}
Expand Down Expand Up @@ -374,10 +374,7 @@ Tabs.propTypes = {
tabClass: PropTypes.string,
panelClass: PropTypes.string,
// labels
showMoreLabel: PropTypes.oneOfType([
PropTypes.string,
PropTypes.node,
]),
showMoreLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.node])
};

Tabs.defaultProps = {
Expand Down
Loading

0 comments on commit 9b3a679

Please sign in to comment.