Skip to content

Commit

Permalink
Merge pull request #25541 from ant-design/master
Browse files Browse the repository at this point in the history
chore: merge master into feature
  • Loading branch information
afc163 committed Jul 9, 2020
2 parents daa0be6 + e5e44d2 commit d5cb860
Show file tree
Hide file tree
Showing 18 changed files with 262 additions and 282 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
references:
container_config: &container_config
docker:
- image: circleci/node:lts
- image: circleci/node:14
working_directory: ~/ant-design

attach_workspace: &attach_workspace
Expand Down
10 changes: 0 additions & 10 deletions components/_util/ref.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,3 @@ export function composeRef<T>(...refs: React.Ref<T>[]): React.Ref<T> {
});
};
}

export function usePrevious<T = undefined>(value: T): T | undefined {
const ref = React.useRef<T>();

React.useEffect(() => {
ref.current = value;
}, [value]);

return ref.current;
}
20 changes: 10 additions & 10 deletions components/calendar/__tests__/__snapshots__/demo.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ exports[`renders ./components/calendar/demo/basic.md correctly 1`] = `
>
<span
class="ant-select-selection-search"
title="2016"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -34,6 +33,7 @@ exports[`renders ./components/calendar/demo/basic.md correctly 1`] = `
</span>
<span
class="ant-select-selection-item"
title="2016"
>
2016
</span>
Expand Down Expand Up @@ -74,7 +74,6 @@ exports[`renders ./components/calendar/demo/basic.md correctly 1`] = `
>
<span
class="ant-select-selection-search"
title="Nov"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -93,6 +92,7 @@ exports[`renders ./components/calendar/demo/basic.md correctly 1`] = `
</span>
<span
class="ant-select-selection-item"
title="Nov"
>
Nov
</span>
Expand Down Expand Up @@ -960,7 +960,6 @@ exports[`renders ./components/calendar/demo/card.md correctly 1`] = `
>
<span
class="ant-select-selection-search"
title="2016"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -979,6 +978,7 @@ exports[`renders ./components/calendar/demo/card.md correctly 1`] = `
</span>
<span
class="ant-select-selection-item"
title="2016"
>
2016
</span>
Expand Down Expand Up @@ -1019,7 +1019,6 @@ exports[`renders ./components/calendar/demo/card.md correctly 1`] = `
>
<span
class="ant-select-selection-search"
title="Nov"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -1038,6 +1037,7 @@ exports[`renders ./components/calendar/demo/card.md correctly 1`] = `
</span>
<span
class="ant-select-selection-item"
title="Nov"
>
Nov
</span>
Expand Down Expand Up @@ -1967,7 +1967,6 @@ exports[`renders ./components/calendar/demo/customize-header.md correctly 1`] =
>
<span
class="ant-select-selection-search"
title="2016"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -1986,6 +1985,7 @@ exports[`renders ./components/calendar/demo/customize-header.md correctly 1`] =
</span>
<span
class="ant-select-selection-item"
title="2016"
>
2016
</span>
Expand Down Expand Up @@ -2031,7 +2031,6 @@ exports[`renders ./components/calendar/demo/customize-header.md correctly 1`] =
>
<span
class="ant-select-selection-search"
title="Nov"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -2050,6 +2049,7 @@ exports[`renders ./components/calendar/demo/customize-header.md correctly 1`] =
</span>
<span
class="ant-select-selection-item"
title="Nov"
>
Nov
</span>
Expand Down Expand Up @@ -2874,7 +2874,6 @@ exports[`renders ./components/calendar/demo/notice-calendar.md correctly 1`] = `
>
<span
class="ant-select-selection-search"
title="2016"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -2893,6 +2892,7 @@ exports[`renders ./components/calendar/demo/notice-calendar.md correctly 1`] = `
</span>
<span
class="ant-select-selection-item"
title="2016"
>
2016
</span>
Expand Down Expand Up @@ -2933,7 +2933,6 @@ exports[`renders ./components/calendar/demo/notice-calendar.md correctly 1`] = `
>
<span
class="ant-select-selection-search"
title="Nov"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -2952,6 +2951,7 @@ exports[`renders ./components/calendar/demo/notice-calendar.md correctly 1`] = `
</span>
<span
class="ant-select-selection-item"
title="Nov"
>
Nov
</span>
Expand Down Expand Up @@ -4227,7 +4227,6 @@ exports[`renders ./components/calendar/demo/select.md correctly 1`] = `
>
<span
class="ant-select-selection-search"
title="2017"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -4246,6 +4245,7 @@ exports[`renders ./components/calendar/demo/select.md correctly 1`] = `
</span>
<span
class="ant-select-selection-item"
title="2017"
>
2017
</span>
Expand Down Expand Up @@ -4286,7 +4286,6 @@ exports[`renders ./components/calendar/demo/select.md correctly 1`] = `
>
<span
class="ant-select-selection-search"
title="Jan"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -4305,6 +4304,7 @@ exports[`renders ./components/calendar/demo/select.md correctly 1`] = `
</span>
<span
class="ant-select-selection-item"
title="Jan"
>
Jan
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ exports[`Calendar Calendar should support locale 1`] = `
>
<span
class="ant-select-selection-search"
title="2018年"
>
<input
aria-activedescendant="rc_select_TEST_OR_SSR_list_0"
Expand All @@ -35,6 +34,7 @@ exports[`Calendar Calendar should support locale 1`] = `
</span>
<span
class="ant-select-selection-item"
title="2018年"
>
2018年
</span>
Expand Down Expand Up @@ -75,7 +75,6 @@ exports[`Calendar Calendar should support locale 1`] = `
>
<span
class="ant-select-selection-search"
title="10月"
>
<input
aria-activedescendant="rc_select_TEST_OR_SSR_list_0"
Expand All @@ -95,6 +94,7 @@ exports[`Calendar Calendar should support locale 1`] = `
</span>
<span
class="ant-select-selection-item"
title="10月"
>
10月
</span>
Expand Down Expand Up @@ -959,7 +959,6 @@ exports[`Calendar rtl render component should be rendered correctly in RTL direc
>
<span
class="ant-select-selection-search"
title="2000"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -978,6 +977,7 @@ exports[`Calendar rtl render component should be rendered correctly in RTL direc
</span>
<span
class="ant-select-selection-item"
title="2000"
>
2000
</span>
Expand Down Expand Up @@ -1018,7 +1018,6 @@ exports[`Calendar rtl render component should be rendered correctly in RTL direc
>
<span
class="ant-select-selection-search"
title="Sep"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -1037,6 +1036,7 @@ exports[`Calendar rtl render component should be rendered correctly in RTL direc
</span>
<span
class="ant-select-selection-item"
title="Sep"
>
Sep
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,6 @@ exports[`renders ./components/collapse/demo/extra.md correctly 1`] = `
>
<span
class="ant-select-selection-search"
title="left"
>
<input
aria-activedescendant="undefined_list_0"
Expand All @@ -684,6 +683,7 @@ exports[`renders ./components/collapse/demo/extra.md correctly 1`] = `
</span>
<span
class="ant-select-selection-item"
title="left"
>
left
</span>
Expand Down
Loading

0 comments on commit d5cb860

Please sign in to comment.