Skip to content

Commit d7e394b

Browse files
del className prop of popper com
1 parent 863588e commit d7e394b

File tree

5 files changed

+17
-24
lines changed

5 files changed

+17
-24
lines changed

src/plugins/moreButtonPlugin/show-more-tabs/button/api.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,6 @@ export default function Api(components) {
8282
})),
8383
);
8484
},
85-
getPopperClassName: function () {
86-
const {showMorePopperClass, tablistViewClass, verticalClass, rtlClass} = this._api.optionsManager.setting;
87-
return (
88-
tablistViewClass +
89-
' ' +
90-
verticalClass +
91-
' ' +
92-
(this._api.getOption('direction') == 'rtl' ? rtlClass + ' ' : '') +
93-
showMorePopperClass
94-
);
95-
},
9685
},
9786
))(this);
9887
}

src/plugins/moreButtonPlugin/show-more-tabs/button/button.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,7 @@ export default function Button(getDeps, props) {
3737
/>
3838
</svg>
3939
</div>
40-
{open ? (
41-
<Popper
42-
{...props}
43-
TabsComponent={ref.current.TabsComponent}
44-
ref={popperRef}
45-
btnRef={btnRef}
46-
className={ref.current.getPopperClassName()}
47-
/>
48-
) : null}
40+
{open ? <Popper {...props} TabsComponent={ref.current.TabsComponent} ref={popperRef} btnRef={btnRef} /> : null}
4941
</>
5042
);
5143
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
export default function getClassName(ins) {
2+
const {showMorePopperClass, tablistViewClass, verticalClass, rtlClass} = ins.optionsManager.setting;
3+
return (
4+
tablistViewClass +
5+
' ' +
6+
verticalClass +
7+
' ' +
8+
(ins.getOption('direction') == 'rtl' ? rtlClass + ' ' : '') +
9+
showMorePopperClass
10+
);
11+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import {forwardRef} from 'react';
22
import createPopper from './createPopper.js';
33
import getPopperMaxHeight from './getPopperMaxHeight.js';
4+
import getClassName from './getClassName.js';
45
import Popper from './popper.js';
56
const clk = (e) => {
67
e.nativeEvent.stopImmediatePropagation();
78
};
89
const getDeps = () => ({
910
createPopper,
1011
getPopperMaxHeight,
12+
getClassName,
1113
clk,
1214
});
1315
export default forwardRef(Popper.bind(null, getDeps));

src/plugins/moreButtonPlugin/show-more-tabs/button/popper/popper.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, {useLayoutEffect} from 'react';
22
import PropTypes from 'prop-types';
33
export default function Popper(getDeps, props, popperRef) {
4-
const {createPopper, getPopperMaxHeight, clk} = getDeps();
5-
const {TabsComponent, instance, hiddenTabIDs, btnRef, className} = props;
4+
const {createPopper, getPopperMaxHeight, getClassName, clk} = getDeps();
5+
const {TabsComponent, instance, hiddenTabIDs, btnRef} = props;
66
useLayoutEffect(() => {
77
popperRef.current.style.maxHeight = getPopperMaxHeight(btnRef.current, 15) + 'px';
88
const popperIns = createPopper(btnRef.current, popperRef.current);
@@ -14,7 +14,7 @@ export default function Popper(getDeps, props, popperRef) {
1414
const openedTabIDs = hiddenTabIDs ? hiddenTabIDs.split(',') : [];
1515
return (
1616
<>
17-
<div onClick={clk} ref={popperRef} className={className}>
17+
<div onClick={clk} ref={popperRef} className={getClassName(instance)}>
1818
<TabsComponent
1919
selectedTabID={selectedTabID}
2020
openTabIDs={openedTabIDs}
@@ -26,7 +26,6 @@ export default function Popper(getDeps, props, popperRef) {
2626
);
2727
}
2828
Popper.propTypes /* remove-proptypes */ = {
29-
className: PropTypes.string,
3029
hiddenTabIDs: PropTypes.string,
3130
instance: PropTypes.object,
3231
btnRef: PropTypes.object,

0 commit comments

Comments
 (0)