amis-ui 2.1.1-beta.2 → 2.3.0

package/esm/components/AnchorNav.d.ts

@@ -18,7 +18,39 @@ declare class AnchorNavSectionComponent extends React.PureComponent<AnchorNavSec
     contentRef: (ref: any) => any;
     render(): JSX.Element;
 }
-export declare const AnchorNavSection: (React.ComponentType<any> & import("hoist-non-react-statics").NonReactStatics<React.ComponentType<any>, {}>) & {
+export declare const AnchorNavSection: {
+    new (props: Omit<AnchorNavSectionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps): {
+        ref: any;
+        childRef(ref: any): void;
+        getWrappedInstance(): any;
+        render(): JSX.Element;
+        context: any;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<AnchorNavSectionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        forceUpdate(callback?: (() => void) | undefined): void;
+        readonly props: Readonly<Omit<AnchorNavSectionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+            children?: React.ReactNode;
+        }>;
+        state: Readonly<{}>;
+        refs: {
+            [key: string]: React.ReactInstance;
+        };
+        componentDidMount?(): void;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<AnchorNavSectionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        componentWillUnmount?(): void;
+        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<AnchorNavSectionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<AnchorNavSectionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        componentWillMount?(): void;
+        UNSAFE_componentWillMount?(): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<AnchorNavSectionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<AnchorNavSectionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<AnchorNavSectionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<AnchorNavSectionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+    };
+    displayName: string;
+    contextType: React.Context<string>;
+    ComposedComponent: React.ComponentType<typeof AnchorNavSectionComponent>;
+} & import("hoist-non-react-statics").NonReactStatics<typeof AnchorNavSectionComponent, {}> & {
     ComposedComponent: typeof AnchorNavSectionComponent;
 };
 export interface AnchorNavProps extends ThemeProps {
@@ -53,9 +85,41 @@ export declare class AnchorNav extends React.Component<AnchorNavProps, AnchorNav
     renderSection(section: any, index: number): React.DetailedReactHTMLElement<any, HTMLElement> | undefined;
     render(): JSX.Element | null;
 }
-declare const _default: ((React.ComponentType<any> & import("hoist-non-react-statics").NonReactStatics<React.ComponentType<any>, {}>) & {
+declare const _default: {
+    new (props: Pick<Omit<AnchorNavProps, keyof ThemeProps>, "links" | "onSelect" | "active" | "sectionRender"> & Partial<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "direction" | "linkClassName" | "sectionClassName">> & Partial<Pick<Pick<AnchorNavProps, "direction" | "linkClassName" | "sectionClassName">, never>> & import("amis-core/lib/theme").ThemeOutterProps): {
+        ref: any;
+        childRef(ref: any): void;
+        getWrappedInstance(): any;
+        render(): JSX.Element;
+        context: any;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "links" | "onSelect" | "active" | "sectionRender"> & Partial<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "direction" | "linkClassName" | "sectionClassName">> & Partial<Pick<Pick<AnchorNavProps, "direction" | "linkClassName" | "sectionClassName">, never>> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        forceUpdate(callback?: (() => void) | undefined): void;
+        readonly props: Readonly<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "links" | "onSelect" | "active" | "sectionRender"> & Partial<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "direction" | "linkClassName" | "sectionClassName">> & Partial<Pick<Pick<AnchorNavProps, "direction" | "linkClassName" | "sectionClassName">, never>> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+            children?: React.ReactNode;
+        }>;
+        state: Readonly<{}>;
+        refs: {
+            [key: string]: React.ReactInstance;
+        };
+        componentDidMount?(): void;
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "links" | "onSelect" | "active" | "sectionRender"> & Partial<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "direction" | "linkClassName" | "sectionClassName">> & Partial<Pick<Pick<AnchorNavProps, "direction" | "linkClassName" | "sectionClassName">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        componentWillUnmount?(): void;
+        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "links" | "onSelect" | "active" | "sectionRender"> & Partial<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "direction" | "linkClassName" | "sectionClassName">> & Partial<Pick<Pick<AnchorNavProps, "direction" | "linkClassName" | "sectionClassName">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "links" | "onSelect" | "active" | "sectionRender"> & Partial<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "direction" | "linkClassName" | "sectionClassName">> & Partial<Pick<Pick<AnchorNavProps, "direction" | "linkClassName" | "sectionClassName">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        componentWillMount?(): void;
+        UNSAFE_componentWillMount?(): void;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "links" | "onSelect" | "active" | "sectionRender"> & Partial<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "direction" | "linkClassName" | "sectionClassName">> & Partial<Pick<Pick<AnchorNavProps, "direction" | "linkClassName" | "sectionClassName">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "links" | "onSelect" | "active" | "sectionRender"> & Partial<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "direction" | "linkClassName" | "sectionClassName">> & Partial<Pick<Pick<AnchorNavProps, "direction" | "linkClassName" | "sectionClassName">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "links" | "onSelect" | "active" | "sectionRender"> & Partial<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "direction" | "linkClassName" | "sectionClassName">> & Partial<Pick<Pick<AnchorNavProps, "direction" | "linkClassName" | "sectionClassName">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "links" | "onSelect" | "active" | "sectionRender"> & Partial<Pick<Omit<AnchorNavProps, keyof ThemeProps>, "direction" | "linkClassName" | "sectionClassName">> & Partial<Pick<Pick<AnchorNavProps, "direction" | "linkClassName" | "sectionClassName">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+    };
+    displayName: string;
+    contextType: React.Context<string>;
+    ComposedComponent: React.ComponentType<typeof AnchorNav>;
+} & import("hoist-non-react-statics").NonReactStatics<typeof AnchorNav, {}> & {
     ComposedComponent: typeof AnchorNav;
-}) & {
+} & {
     AnchorNavSection: typeof AnchorNavSection;
 };
 export default _default;

package/esm/components/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.1.1-beta.2
+ * amis-ui v2.3.0
  * Copyright 2018-2022 fex
  */
 
@@ -41,11 +41,9 @@ var AnchorNav = /** @class */ (function (_super) {
         this.setState({ fromSelect: false });
         var sectionRootDom = this.contentDom && this.contentDom.current;
         this.updateSectionOffset(sectionRootDom, false);
-        this.observer = new MutationObserver(function (mutations) {
-            var ModDetected = mutations.some(function (record) { var _a; return (_a = record.target.parentNode) === null || _a === void 0 ? void 0 : _a.isSameNode(sectionRootDom); });
-            if (ModDetected) {
-                _this.updateSectionOffset(sectionRootDom, true);
-            }
+        this.observer = new MutationObserver(function () {
+            // TODO: 牺牲性能
+            return _this.updateSectionOffset(sectionRootDom, true);
         });
         this.observer.observe(sectionRootDom, { childList: true, subtree: true });
     };
@@ -81,7 +79,9 @@ var AnchorNav = /** @class */ (function (_super) {
             return;
         }
         // 获取滚动的scrollTop
-        var scrollTop = e.target.scrollTop;
+        var _a = e.target, scrollTop = _a.scrollTop, scrollHeight = _a.scrollHeight, clientHeight = _a.clientHeight;
+        // 是否到达最底部，以防最后一个因为高度不够无法高亮
+        var isReachBottom = scrollTop + clientHeight >= scrollHeight;
         // 判断scrollTop所在区域
         var offsetArr = this.state.offsetArr;
         var firstSection = offsetArr[0];
@@ -93,7 +93,7 @@ var AnchorNav = /** @class */ (function (_super) {
             this.fireSelect(firstSection.key);
         }
         // 最后一层
-        else if (offset >= lastSection.offsetTop) {
+        else if (isReachBottom || offset >= lastSection.offsetTop) {
             this.fireSelect(lastSection.key);
         }
         else {
@@ -143,7 +143,7 @@ var AnchorNav = /** @class */ (function (_super) {
         var _b = link.props, title = _b.title, name = _b.name;
         var active = activeProp === undefined && index === 0 ? name : activeProp;
         return (React__default.createElement("li", { className: cx('AnchorNav-link', active === name ? 'is-active' : ''), key: index, onClick: function () { return _this.handleSelect(name); } },
-            React__default.createElement("a", null, title)));
+            React__default.createElement("a", { title: title }, title)));
     };
     AnchorNav.prototype.renderSection = function (section, index) {
         if (!section) {