Skip to content

Commit

Permalink
chore: marge feat/react-18
Browse files Browse the repository at this point in the history
  • Loading branch information
simonguo committed Aug 30, 2022
2 parents 5c45ca2 + dd75aca commit 6a3e4e0
Show file tree
Hide file tree
Showing 38 changed files with 607 additions and 245 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,17 @@
# [5.17.0](https://github.com/rsuite/rsuite/compare/v5.16.6...v5.17.0) (2022-08-26)

### Features

- **DateRangePicker:** supports placing predefined ranges on the left ([#2670](https://github.com/rsuite/rsuite/issues/2670)) ([8df4a61](https://github.com/rsuite/rsuite/commit/8df4a61d3b81e6054369197ff44e1416ea1aefbb))

## [5.16.6](https://github.com/rsuite/rsuite/compare/v5.16.5...v5.16.6) (2022-08-18)

### Bug Fixes

- **Button:** use [@cursor-disabled](https://github.com/cursor-disabled) intead of hardcoded cursor ([#2658](https://github.com/rsuite/rsuite/issues/2658)) ([5731762](https://github.com/rsuite/rsuite/commit/57317622eb2d65e94e0a8bb962512232cc4dfd3d))
- **DatePicker,DateRangePicker:** display month name as title of month calendar view ([#2660](https://github.com/rsuite/rsuite/issues/2660)) ([1e812ef](https://github.com/rsuite/rsuite/commit/1e812ef7510ea7b82beda7c058bd07080db198f5))
- **Form.Control:** apply className to accepter component ([#2662](https://github.com/rsuite/rsuite/issues/2662)) ([a164d28](https://github.com/rsuite/rsuite/commit/a164d287acfe8be2f98080e3b7eb15971f47809f))

## [5.16.5](https://github.com/rsuite/rsuite/compare/v5.16.4...v5.16.5) (2022-08-11)

### Bug Fixes
Expand Down
9 changes: 8 additions & 1 deletion docs/components/PageToolbar/PageToolbar.tsx
@@ -1,10 +1,11 @@
import React, { useEffect } from 'react';
import { ButtonToolbar, Tooltip, Whisper, Dropdown } from 'rsuite';
import { ButtonToolbar, Tooltip, Whisper, Dropdown, IconButton } from 'rsuite';
import canUseDOM from 'dom-lib/canUseDOM';
import AppContext from '../AppContext';
import LanguageButton from '../LanguageButton';
import packageJson from '../../package.json';
import { MoreActions } from './MoreActions';
import HeartIcon from '@rsuite/icons/legacy/HeartO';

interface PageToolbarProps {
designHash?: any;
Expand Down Expand Up @@ -35,6 +36,12 @@ function PageToolbar({ designHash, routerId }: PageToolbarProps) {

return show ? (
<ButtonToolbar className="page-toolbar">
<IconButton
size="sm"
icon={<HeartIcon color="red" />}
href="https://opencollective.com/rsuite"
target="_blank"
/>
<Dropdown title={packageJson.version} size="sm">
{versions.map(version => (
<Dropdown.Item key={version.id} as="a" href={version.url}>
Expand Down
2 changes: 1 addition & 1 deletion docs/components/TopLevelNav/TopLevelNav.tsx
Expand Up @@ -76,7 +76,7 @@ function getNavItems(messages) {
{
key: 'resources',
tip: messages?.common?.resources,
to: '/resources/icons',
to: '/resources/templates',
icon: <Icon as={() => <SvgIcons.Ecology />} />
}
];
Expand Down
1 change: 1 addition & 0 deletions docs/less/pages/index.less
Expand Up @@ -16,6 +16,7 @@
/** Resources & Tools **/
@import './resources/icons.less';
@import './resources/palette.less';
@import './resources/templates.less';

.page-home {
position: relative;
Expand Down
25 changes: 25 additions & 0 deletions docs/less/pages/resources/templates.less
@@ -0,0 +1,25 @@
.tpl-card {
display: block;
height: 346px;
text-decoration: none;
margin-bottom: 10px;
position: relative;

.preview-actions {
align-items: center;
justify-content: center;
gap: 6px;
position: absolute;
top: 0px;
width: 100%;
height: 100%;
background: rgba(17, 17, 17, 0.125);
transition: opacity 0.3s ease-in-out;
opacity: 0;
}
&:hover {
.preview-actions {
opacity: 1;
}
}
}
1 change: 1 addition & 0 deletions docs/locales/en-US/index.ts
Expand Up @@ -10,6 +10,7 @@ export default {
design: 'Design',
components: 'Components',
resources: 'Resources & Tools',
templates: 'Templates',
designResources: 'Design Resources',
introduction: 'Introduction',
usage: 'Quick Start',
Expand Down
1 change: 1 addition & 0 deletions docs/locales/zh-CN/index.ts
Expand Up @@ -9,6 +9,7 @@ export default {
design: '设计原型',
components: '组件',
resources: '资源 & 工具',
templates: '模板',
designResources: '设计资源',
introduction: '介绍',
usage: '快速开始',
Expand Down
76 changes: 33 additions & 43 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/package.json
@@ -1,6 +1,6 @@
{
"name": "docs",
"version": "5.16.4",
"version": "5.17.0",
"private": true,
"scripts": {
"check:type": "tsc",
Expand Down Expand Up @@ -46,7 +46,7 @@
"react-icons": "^4.2.0",
"react-json-tree": "^0.15.0",
"react-text-mask": "^5.4.3",
"rsuite": "^5.16.4",
"rsuite": "^5.17.0",
"svg-sprite-loader": "^4.1.6",
"svgo": "^1.3.2",
"svgo-loader": "^2.2.1",
Expand Down
4 changes: 4 additions & 0 deletions docs/pages/_common/types/range.md
Expand Up @@ -5,5 +5,9 @@ interface Range {
label: React.ReactNode;
value: Date | ((date: Date) => Date);
closeOverlay?: boolean;

// Sets the position where the predefined range is displayed, the default is bottom.
// Only supported on DateRangePicker。
placement?: 'bottom' | 'left';
}
```

0 comments on commit 6a3e4e0

Please sign in to comment.