Skip to content

Commit 6b1a48d

Browse files
MadCccMadCcc
authored
revert: Revert "Merge branch 'feature' into master" (ant-design#33903)
This reverts commit 40433f3, reversing changes made to 27a498e.
1 parent 40433f3 commit 6b1a48d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+122
-5796
lines changed

‎components/_util/motion.tsx

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { CSSMotionProps, MotionEventHandler, MotionEndEventHandler } from 'rc-motion';
22
import { MotionEvent } from 'rc-motion/lib/interface';
3-
import { tuple } from './type';
43

54
// ================== Collapse Motion ==================
65
const getCollapsedHeight: MotionEventHandler = () => ({ height: 0, opacity: 0 });
@@ -26,21 +25,11 @@ const collapseMotion: CSSMotionProps = {
2625
motionDeadline: 500,
2726
};
2827

29-
const SelectPlacements = tuple('bottomLeft', 'bottomRight', 'topLeft', 'topRight');
30-
export type SelectCommonPlacement = typeof SelectPlacements[number];
31-
32-
const getTransitionDirection = (placement: SelectCommonPlacement | undefined) => {
33-
if (placement !== undefined && (placement === 'topLeft' || placement === 'topRight')) {
34-
return `slide-down`;
35-
}
36-
return `slide-up`;
37-
};
38-
3928
const getTransitionName = (rootPrefixCls: string, motion: string, transitionName?: string) => {
4029
if (transitionName !== undefined) {
4130
return transitionName;
4231
}
4332
return `${rootPrefixCls}-${motion}`;
4433
};
45-
export { getTransitionName, getTransitionDirection };
34+
export { getTransitionName };
4635
export default collapseMotion;

‎components/breadcrumb/BreadcrumbItem.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const BreadcrumbItem: BreadcrumbItemInterface = ({
3030
const renderBreadcrumbNode = (breadcrumbItem: React.ReactNode) => {
3131
if (overlay) {
3232
return (
33-
<DropDown overlay={overlay} placement="bottom" {...dropdownProps}>
33+
<DropDown overlay={overlay} placement="bottomCenter" {...dropdownProps}>
3434
<span className={`${prefixCls}-overlay-link`}>
3535
{breadcrumbItem}
3636
<DownOutlined />
@@ -62,7 +62,9 @@ const BreadcrumbItem: BreadcrumbItemInterface = ({
6262
return (
6363
<span>
6464
{link}
65-
{separator && <span className={`${prefixCls}-separator`}>{separator}</span>}
65+
{separator && (
66+
<span className={`${prefixCls}-separator`}>{separator}</span>
67+
)}
6668
</span>
6769
);
6870
}

‎components/cascader/__tests__/__snapshots__/demo-extend.test.ts.snap

Lines changed: 0 additions & 235 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,241 +1674,6 @@ exports[`renders ./components/cascader/demo/multiple.md extend context correctly
16741674
</div>
16751675
`;
16761676

1677-
exports[`renders ./components/cascader/demo/placement.md extend context correctly 1`] = `
1678-
Array [
1679-
<div
1680-
class="ant-radio-group ant-radio-group-outline"
1681-
>
1682-
<label
1683-
class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"
1684-
>
1685-
<span
1686-
class="ant-radio-button ant-radio-button-checked"
1687-
>
1688-
<input
1689-
checked=""
1690-
class="ant-radio-button-input"
1691-
type="radio"
1692-
value="topLeft"
1693-
/>
1694-
<span
1695-
class="ant-radio-button-inner"
1696-
/>
1697-
</span>
1698-
<span>
1699-
topLeft
1700-
</span>
1701-
</label>
1702-
<label
1703-
class="ant-radio-button-wrapper"
1704-
>
1705-
<span
1706-
class="ant-radio-button"
1707-
>
1708-
<input
1709-
class="ant-radio-button-input"
1710-
type="radio"
1711-
value="topRight"
1712-
/>
1713-
<span
1714-
class="ant-radio-button-inner"
1715-
/>
1716-
</span>
1717-
<span>
1718-
topRight
1719-
</span>
1720-
</label>
1721-
<label
1722-
class="ant-radio-button-wrapper"
1723-
>
1724-
<span
1725-
class="ant-radio-button"
1726-
>
1727-
<input
1728-
class="ant-radio-button-input"
1729-
type="radio"
1730-
value="bottomLeft"
1731-
/>
1732-
<span
1733-
class="ant-radio-button-inner"
1734-
/>
1735-
</span>
1736-
<span>
1737-
bottomLeft
1738-
</span>
1739-
</label>
1740-
<label
1741-
class="ant-radio-button-wrapper"
1742-
>
1743-
<span
1744-
class="ant-radio-button"
1745-
>
1746-
<input
1747-
class="ant-radio-button-input"
1748-
type="radio"
1749-
value="bottomRight"
1750-
/>
1751-
<span
1752-
class="ant-radio-button-inner"
1753-
/>
1754-
</span>
1755-
<span>
1756-
bottomRight
1757-
</span>
1758-
</label>
1759-
</div>,
1760-
<br />,
1761-
<br />,
1762-
<div
1763-
class="ant-select ant-cascader ant-select-single ant-select-allow-clear ant-select-show-arrow"
1764-
>
1765-
<div
1766-
class="ant-select-selector"
1767-
>
1768-
<span
1769-
class="ant-select-selection-search"
1770-
>
1771-
<input
1772-
aria-autocomplete="list"
1773-
aria-controls="undefined_list"
1774-
aria-haspopup="listbox"
1775-
aria-owns="undefined_list"
1776-
autocomplete="off"
1777-
class="ant-select-selection-search-input"
1778-
readonly=""
1779-
role="combobox"
1780-
style="opacity:0"
1781-
type="search"
1782-
unselectable="on"
1783-
value=""
1784-
/>
1785-
</span>
1786-
<span
1787-
class="ant-select-selection-placeholder"
1788-
>
1789-
Please select
1790-
</span>
1791-
</div>
1792-
<div>
1793-
<div
1794-
class="ant-select-dropdown ant-cascader-dropdown"
1795-
style="opacity:0;pointer-events:none;min-width:auto"
1796-
>
1797-
<div>
1798-
<div
1799-
class="ant-cascader-menus"
1800-
>
1801-
<ul
1802-
class="ant-cascader-menu"
1803-
role="menu"
1804-
>
1805-
<li
1806-
aria-checked="false"
1807-
class="ant-cascader-menu-item ant-cascader-menu-item-expand"
1808-
data-path-key="zhejiang"
1809-
role="menuitemcheckbox"
1810-
title="Zhejiang"
1811-
>
1812-
<div
1813-
class="ant-cascader-menu-item-content"
1814-
>
1815-
Zhejiang
1816-
</div>
1817-
<div
1818-
class="ant-cascader-menu-item-expand-icon"
1819-
>
1820-
<span
1821-
aria-label="right"
1822-
class="anticon anticon-right"
1823-
role="img"
1824-
>
1825-
<svg
1826-
aria-hidden="true"
1827-
data-icon="right"
1828-
fill="currentColor"
1829-
focusable="false"
1830-
height="1em"
1831-
viewBox="64 64 896 896"
1832-
width="1em"
1833-
>
1834-
<path
1835-
d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"
1836-
/>
1837-
</svg>
1838-
</span>
1839-
</div>
1840-
</li>
1841-
<li
1842-
aria-checked="false"
1843-
class="ant-cascader-menu-item ant-cascader-menu-item-expand"
1844-
data-path-key="jiangsu"
1845-
role="menuitemcheckbox"
1846-
title="Jiangsu"
1847-
>
1848-
<div
1849-
class="ant-cascader-menu-item-content"
1850-
>
1851-
Jiangsu
1852-
</div>
1853-
<div
1854-
class="ant-cascader-menu-item-expand-icon"
1855-
>
1856-
<span
1857-
aria-label="right"
1858-
class="anticon anticon-right"
1859-
role="img"
1860-
>
1861-
<svg
1862-
aria-hidden="true"
1863-
data-icon="right"
1864-
fill="currentColor"
1865-
focusable="false"
1866-
height="1em"
1867-
viewBox="64 64 896 896"
1868-
width="1em"
1869-
>
1870-
<path
1871-
d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"
1872-
/>
1873-
</svg>
1874-
</span>
1875-
</div>
1876-
</li>
1877-
</ul>
1878-
</div>
1879-
</div>
1880-
</div>
1881-
</div>
1882-
<span
1883-
aria-hidden="true"
1884-
class="ant-select-arrow"
1885-
style="user-select:none;-webkit-user-select:none"
1886-
unselectable="on"
1887-
>
1888-
<span
1889-
aria-label="down"
1890-
class="anticon anticon-down ant-select-suffix"
1891-
role="img"
1892-
>
1893-
<svg
1894-
aria-hidden="true"
1895-
data-icon="down"
1896-
fill="currentColor"
1897-
focusable="false"
1898-
height="1em"
1899-
viewBox="64 64 896 896"
1900-
width="1em"
1901-
>
1902-
<path
1903-
d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
1904-
/>
1905-
</svg>
1906-
</span>
1907-
</span>
1908-
</div>,
1909-
]
1910-
`;
1911-
19121677
exports[`renders ./components/cascader/demo/search.md extend context correctly 1`] = `
19131678
<div
19141679
class="ant-select ant-cascader ant-select-single ant-select-allow-clear ant-select-show-arrow ant-select-show-search"

0 commit comments

Comments
 (0)