Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: tabs mini #1136

Merged
merged 11 commits into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,8 @@
"stylelint-config-za": "0.3.0",
"stylelint-scss": "^3.18.0",
"typescript": "~4.5.0"
},
"engines": {
"node": ">= 16.18.1"
}
}
1 change: 1 addition & 0 deletions packages/mini-demo/src/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export default defineAppConfig({
'pages/popup/index',
'pages/list/index',
'pages/collapse/index',
'pages/tabs/index',
],
window: {
backgroundTextStyle: 'light',
Expand Down
21 changes: 21 additions & 0 deletions packages/mini-demo/src/pages/tabs/component/basic.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React, { useState } from 'react';
import { Panel, Tabs } from 'zarm/mini';

const Demo = () => {
const [value, setValue] = useState(0);

return (
<Panel title="基本用法">
<Tabs value={value} onChange={setValue}>
<Tabs.Panel title="选项卡1">
<div className="content">选项卡1内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡2">
<div className="content">选项卡2内容</div>
</Tabs.Panel>
</Tabs>
</Panel>
);
};

export default Demo;
24 changes: 24 additions & 0 deletions packages/mini-demo/src/pages/tabs/component/disable.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React, { useState } from 'react';
import { Panel, Tabs } from 'zarm/mini';

const Demo = () => {
const [value, setValue] = useState(0);

return (
<Panel title="禁用指定选项">
<Tabs value={value} onChange={setValue}>
<Tabs.Panel title="选项卡1">
<div className="content">选项卡1内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡2" disabled>
<div className="content">选项卡2内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡3">
<div className="content">选项卡3内容</div>
</Tabs.Panel>
</Tabs>
</Panel>
);
};

export default Demo;
24 changes: 24 additions & 0 deletions packages/mini-demo/src/pages/tabs/component/line-width.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React, { useState } from 'react';
import { Panel, Tabs } from 'zarm/mini';

const Demo = () => {
const [value, setValue] = useState(0);

return (
<Panel title="指定线条宽度">
<Tabs value={value} onChange={setValue} lineWidth="60px">
<Tabs.Panel title="选项卡1">
<div className="content">选项卡1内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡2">
<div className="content">选项卡2内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡3">
<div className="content">选项卡3内容</div>
</Tabs.Panel>
</Tabs>
</Panel>
);
};

export default Demo;
33 changes: 33 additions & 0 deletions packages/mini-demo/src/pages/tabs/component/scrollable.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import React, { useState } from 'react';
import { Panel, Tabs } from 'zarm/mini';

const Demo = () => {
const [value, setValue] = useState(0);

return (
<Panel title="标签栏滚动">
<Tabs value={value} onChange={setValue} scrollable>
<Tabs.Panel title="选项卡1">
<div className="content">选项卡1内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡2">
<div className="content">选项卡2内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡3">
<div className="content">选项卡3内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡4">
<div className="content">选项卡1内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡5">
<div className="content">选项卡2内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡6">
<div className="content">选项卡3内容</div>
</Tabs.Panel>
</Tabs>
</Panel>
);
};

export default Demo;
21 changes: 21 additions & 0 deletions packages/mini-demo/src/pages/tabs/component/swipeable.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React, { useState } from 'react';
import { Panel, Tabs } from 'zarm/mini';

const Demo = () => {
const [value, setValue] = useState(0);

return (
<Panel title="可滑动">
<Tabs value={value} onChange={setValue} swipeable>
<Tabs.Panel title="选项卡1">
<div className="content">选项卡1内容</div>
</Tabs.Panel>
<Tabs.Panel title="选项卡2">
<div className="content">选项卡2内容</div>
</Tabs.Panel>
</Tabs>
</Panel>
);
};

export default Demo;
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { View } from '@tarojs/components';
import React, { useState } from 'react';
import { Panel, Tabs } from 'zarm/mini';

const Demo = () => {
const [value, setValue] = useState(0);

return (
<Panel title="垂直限制高度">
<Tabs
value={value}
onChange={setValue}
direction="vertical"
scrollable
className="custom-height"
>
<Tabs.Panel title="选项卡1">
<View className="vertical-content">选项卡1内容</View>
</Tabs.Panel>
<Tabs.Panel title="选项卡2">
<View className="vertical-content">选项卡2内容</View>
</Tabs.Panel>
<Tabs.Panel title="选项卡3">
<View className="vertical-content">选项卡3内容</View>
</Tabs.Panel>
<Tabs.Panel title="选项卡4">
<View className="vertical-content">选项卡4内容</View>
</Tabs.Panel>
<Tabs.Panel title="选项卡5">
<View className="vertical-content">选项卡5内容</View>
</Tabs.Panel>
<Tabs.Panel title="选项卡6">
<View className="vertical-content">选项卡6内容</View>
</Tabs.Panel>
<Tabs.Panel title="选项卡7">
<View className="vertical-content">选项卡7内容</View>
</Tabs.Panel>
</Tabs>
</Panel>
);
};

export default Demo;
31 changes: 31 additions & 0 deletions packages/mini-demo/src/pages/tabs/component/vertical.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { View } from '@tarojs/components';
import React, { useState } from 'react';
import { Panel, Tabs } from 'zarm/mini';

const Demo = () => {
const [value, setValue] = useState(0);

return (
<Panel title="垂直">
<Tabs value={value} onChange={setValue} direction="vertical">
<Tabs.Panel title="选项卡1">
<View className="vertical-content">选项卡1内容</View>
</Tabs.Panel>
<Tabs.Panel title="选项卡2">
<View className="vertical-content">选项卡2内容</View>
</Tabs.Panel>
<Tabs.Panel title="选项卡3">
<View className="vertical-content">选项卡3内容</View>
</Tabs.Panel>
<Tabs.Panel title="选项卡4">
<View className="vertical-content">选项卡4内容</View>
</Tabs.Panel>
<Tabs.Panel title="选项卡5">
<View className="vertical-content">选项卡5内容</View>
</Tabs.Panel>
</Tabs>
</Panel>
);
};

export default Demo;
3 changes: 3 additions & 0 deletions packages/mini-demo/src/pages/tabs/index.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default definePageConfig({
navigationBarTitleText: 'Tabs',
});
19 changes: 19 additions & 0 deletions packages/mini-demo/src/pages/tabs/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.content {
min-height: 300px;
display: flex;
align-items: center;
justify-content: center;
}

.custom-height {
.za-tabs__tablist {
height: 400px;
}
}

.vertical-content {
height: 100%;
display: flex;
align-items: center;
justify-content: center;
}
23 changes: 23 additions & 0 deletions packages/mini-demo/src/pages/tabs/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import * as React from 'react';
import Basic from './component/basic';
import Disable from './component/disable';
import LineWidth from './component/line-width';
import Scrollable from './component/scrollable';
import Swipeable from './component/swipeable';
import Vertical from './component/vertical';
import VerticalScrollable from './component/vertical-scrollable';
import './index.scss';

export default () => {
return (
<>
<Basic />
<Disable />
<LineWidth />
<Scrollable />
<Swipeable />
<VerticalScrollable />
<Vertical />
</>
);
};
20 changes: 20 additions & 0 deletions packages/mini-demo/src/site.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,26 @@ const siteMap = {
// },
// ]
// },
navigation: {
title: '导航',
components: [
// {
// key: 'TabBar',
// name: '标签栏',
// page: '/pages/tab-bar/index',
// },
// {
// key: 'Navbar',
// name: '导航栏',
// page: '/pages/navbar/index',
// },
{
key: 'Tabs',
name: '标签页',
page: '/pages/tabs/index',
},
],
},
};

export default siteMap;
2 changes: 2 additions & 0 deletions packages/zarm/src/index.mini.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ export type { PanelProps } from './panel/index.mini';
export { default as Popup } from './popup/index.mini';
export type { PopupProps } from './popup/index.mini';
export { default as Select } from './select';
export { default as Tabs } from './tabs/index.mini';
export type { TabPanelProps, TabsCssVars, TabsProps } from './tabs/index.mini';
18 changes: 12 additions & 6 deletions packages/zarm/src/tabs/TabPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
import * as React from 'react';
import { createBEM } from '@zarm-design/bem';
import * as React from 'react';
import { ConfigContext } from '../config-provider';
import type { BaseTabPanelProps } from './interface';
import type { HTMLProps } from '../utils/utilityTypes';
import TabsContext from './context';
import type { BaseTabPanelProps } from './interface';

export type TabPanelProps = BaseTabPanelProps & HTMLProps;

const TabPanel = React.forwardRef<HTMLDivElement, TabPanelProps>((props, ref) => {
const { className, selected, children, style } = props;
const { className, value, children, style } = props;
const { prefixCls } = React.useContext(ConfigContext);
const bem = createBEM('tabs__panel', { prefixCls });

const cls = bem([{
active: selected,
}, className]);
const { current } = React.useContext(TabsContext);

const cls = bem([
{
active: current === value,
},
className,
]);

return (
<div ref={ref} className={cls} style={style} role="tabpanel">
Expand Down
Loading