diff --git a/antdv-demo b/antdv-demo
index 7875c8b3e..1fcb6d17a 160000
--- a/antdv-demo
+++ b/antdv-demo
@@ -1 +1 @@
-Subproject commit 7875c8b3e46c0162afc28f884aca418de72c3534
+Subproject commit 1fcb6d17a15cccb3ce44539a1bbf9612e74933cd
diff --git a/components/anchor/Anchor.jsx b/components/anchor/Anchor.jsx
index acd05c50c..b24a6300c 100644
--- a/components/anchor/Anchor.jsx
+++ b/components/anchor/Anchor.jsx
@@ -281,7 +281,7 @@ export default {
visible: activeLink,
});
- const wrapperClass = classNames(this.wrapperClass, `${prefixCls}-wrapper`);
+ const wrapperClass = classNames(this.$attrs.class, this.wrapperClass, `${prefixCls}-wrapper`);
const anchorClass = classNames(prefixCls, {
fixed: !affix && !showInkInFixed,
@@ -290,6 +290,7 @@ export default {
const wrapperStyle = {
maxHeight: offsetTop ? `calc(100vh - ${offsetTop}px)` : '100vh',
...this.wrapperStyle,
+ ...this.$attrs.style,
};
const anchorContent = (
diff --git a/components/anchor/AnchorLink.jsx b/components/anchor/AnchorLink.jsx
index 1a7e8bdcf..f80ba5f9b 100644
--- a/components/anchor/AnchorLink.jsx
+++ b/components/anchor/AnchorLink.jsx
@@ -3,6 +3,7 @@ import PropTypes from '../_util/vue-types';
import { initDefaultProps, getComponent } from '../_util/props-util';
import classNames from 'classnames';
import { ConfigConsumerProps } from '../config-provider';
+function noop() {}
export const AnchorLinkProps = {
prefixCls: PropTypes.string,
@@ -18,7 +19,11 @@ export default {
}),
setup() {
return {
- antAnchor: inject('antAnchor', {}),
+ antAnchor: inject('antAnchor', {
+ registerLink: noop,
+ unregisterLink: noop,
+ scrollTo: noop,
+ }),
antAnchorContext: inject('antAnchorContext', {}),
configProvider: inject('configProvider', ConfigConsumerProps),
};
@@ -57,7 +62,7 @@ export default {
const prefixCls = getPrefixCls('anchor', customizePrefixCls);
const title = getComponent(this, 'title');
- const active = this.antAnchor.$data.activeLink === href;
+ const active = this.antAnchor.activeLink === href;
const wrapperClassName = classNames(`${prefixCls}-link`, {
[`${prefixCls}-link-active`]: active,
});
diff --git a/components/card/__tests__/__snapshots__/demo.test.js.snap b/components/card/__tests__/__snapshots__/demo.test.js.snap
index 53f4e8b97..091e50dc8 100644
--- a/components/card/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/card/__tests__/__snapshots__/demo.test.js.snap
@@ -310,7 +310,7 @@ exports[`renders ./antdv-demo/docs/card/demo/tabs.md correctly 1`] = `
-
+
@@ -353,7 +353,7 @@ exports[`renders ./antdv-demo/docs/card/demo/tabs.md correctly 1`] = `
-
+
diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
index 3f92f940e..6aed23390 100644
--- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
+++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
@@ -8,7 +8,7 @@ exports[`Locale Provider set moment locale when locale changes 1`] = `
-
+
diff --git a/components/page-header/__tests__/__snapshots__/demo.test.js.snap b/components/page-header/__tests__/__snapshots__/demo.test.js.snap
index 7c504c38c..2710fb58b 100644
--- a/components/page-header/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/page-header/__tests__/__snapshots__/demo.test.js.snap
@@ -1221,7 +1221,7 @@ exports[`renders ./antdv-demo/docs/page-header/demo/responsive.md correctly 1`]
diff --git a/components/tabs/__tests__/__snapshots__/demo.test.js.snap b/components/tabs/__tests__/__snapshots__/demo.test.js.snap
index 80066065d..b479497c2 100644
--- a/components/tabs/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tabs/__tests__/__snapshots__/demo.test.js.snap
@@ -20,7 +20,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/basic.md correctly 1`] = `
-
+
@@ -58,7 +58,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/card.md correctly 1`] = `
-
+
@@ -97,7 +97,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/card-top.md correctly 1`] = `
-
+
Content of Tab Pane 1
@@ -146,7 +146,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/custom-add-trigger.md correctly 1`]
-
+
@@ -181,7 +181,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/custom-tab-bar.md correctly 1`] = `
-
+
@@ -219,7 +219,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/disabled.md correctly 1`] = `
-
+
@@ -267,7 +267,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/editable-card.md correctly 1`] = `
-
+
@@ -307,7 +307,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/extra.md correctly 1`] = `
-
+
@@ -344,7 +344,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/icon.md correctly 1`] = `
-
+
@@ -417,7 +417,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/nest.md correctly 1`] = `
-
+
@@ -455,7 +455,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/nest.md correctly 1`] = `
-
+
@@ -591,7 +591,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/position.md correctly 1`] = `
-
+
@@ -632,7 +632,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/size.md correctly 1`] = `
-
+
@@ -700,7 +700,7 @@ exports[`renders ./antdv-demo/docs/tabs/demo/slide.md correctly 1`] = `
-
+
diff --git a/components/tabs/__tests__/__snapshots__/index.test.js.snap b/components/tabs/__tests__/__snapshots__/index.test.js.snap
index 4da8c5102..3d396efb3 100644
--- a/components/tabs/__tests__/__snapshots__/index.test.js.snap
+++ b/components/tabs/__tests__/__snapshots__/index.test.js.snap
@@ -18,7 +18,7 @@ exports[`Tabs tabPosition remove card 1`] = `
-