diff --git a/components/affix/index.tsx b/components/affix/index.tsx
index e6ee0e972..9b9449be9 100644
--- a/components/affix/index.tsx
+++ b/components/affix/index.tsx
@@ -23,7 +23,7 @@ import {
 } from './utils';
 import useConfigInject from '../_util/hooks/useConfigInject';
 import omit from '../_util/omit';
-
+import useStyle from './style';
 function getDefaultTarget() {
   return typeof window !== 'undefined' ? window : null;
 }
@@ -74,8 +74,9 @@ export type AffixInstance = ComponentPublicInstance<AffixProps, AffixExpose>;
 const Affix = defineComponent({
   compatConfig: { MODE: 3 },
   name: 'AAffix',
+  inheritAttrs: false,
   props: affixProps(),
-  setup(props, { slots, emit, expose }) {
+  setup(props, { slots, emit, expose, attrs }) {
     const placeholderNode = ref();
     const fixedNode = ref();
     const state = reactive({
@@ -113,6 +114,15 @@ const Affix = defineComponent({
       const placeholderReact = getTargetRect(placeholderNode.value as HTMLElement);
       const fixedTop = getFixedTop(placeholderReact, targetRect, offsetTop.value);
       const fixedBottom = getFixedBottom(placeholderReact, targetRect, offsetBottom.value);
+
+      if (
+        placeholderReact.top === 0 &&
+        placeholderReact.left === 0 &&
+        placeholderReact.width === 0 &&
+        placeholderReact.height === 0
+      ) {
+        return;
+      }
       if (fixedTop !== undefined) {
         newState.affixStyle = {
           position: 'fixed',
@@ -228,11 +238,12 @@ const Affix = defineComponent({
     });
 
     const { prefixCls } = useConfigInject('affix', props);
-
+    const [wrapSSR, hashId] = useStyle(prefixCls);
     return () => {
       const { affixStyle, placeholderStyle } = state;
       const className = classNames({
         [prefixCls.value]: affixStyle,
+        [hashId.value]: true,
       });
       const restProps = omit(props, [
         'prefixCls',
@@ -242,14 +253,15 @@ const Affix = defineComponent({
         'onChange',
         'onTestUpdatePosition',
       ]);
-      return (
+      return wrapSSR(
         <ResizeObserver onResize={updatePosition}>
-          <div {...restProps} style={placeholderStyle} ref={placeholderNode}>
+          <div {...restProps} {...attrs} ref={placeholderNode}>
+            {affixStyle && <div style={placeholderStyle} aria-hidden="true" />}
             <div class={className} ref={fixedNode} style={affixStyle}>
               {slots.default?.()}
             </div>
           </div>
-        </ResizeObserver>
+        </ResizeObserver>,
       );
     };
   },
diff --git a/components/affix/style/index.less b/components/affix/style/index.less
deleted file mode 100644
index 3762903fc..000000000
--- a/components/affix/style/index.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import '../../style/themes/index';
-
-.@{ant-prefix}-affix {
-  position: fixed;
-  z-index: @zindex-affix;
-}
diff --git a/components/affix/style/index.ts b/components/affix/style/index.ts
new file mode 100644
index 000000000..c33c3176e
--- /dev/null
+++ b/components/affix/style/index.ts
@@ -0,0 +1,27 @@
+import type { CSSObject } from '../../_util/cssinjs';
+import type { FullToken, GenerateStyle } from '../../theme/internal';
+import { genComponentStyleHook, mergeToken } from '../../theme/internal';
+
+interface AffixToken extends FullToken<'Affix'> {
+  zIndexPopup: number;
+}
+
+// ============================== Shared ==============================
+const genSharedAffixStyle: GenerateStyle<AffixToken> = (token): CSSObject => {
+  const { componentCls } = token;
+
+  return {
+    [componentCls]: {
+      position: 'fixed',
+      zIndex: token.zIndexPopup,
+    },
+  };
+};
+
+// ============================== Export ==============================
+export default genComponentStyleHook('Affix', token => {
+  const affixToken = mergeToken<AffixToken>(token, {
+    zIndexPopup: token.zIndexBase + 10,
+  });
+  return [genSharedAffixStyle(affixToken)];
+});
diff --git a/components/affix/style/index.tsx b/components/affix/style/index.tsx
deleted file mode 100644
index 3a3ab0de5..000000000
--- a/components/affix/style/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-import '../../style/index.less';
-import './index.less';
diff --git a/components/affix/utils.ts b/components/affix/utils.ts
index ec9189476..66d36aa1b 100644
--- a/components/affix/utils.ts
+++ b/components/affix/utils.ts
@@ -55,7 +55,7 @@ export function getObserverEntities() {
 export function addObserveTarget<T>(target: HTMLElement | Window | null, affix: T): void {
   if (!target) return;
 
-  let entity: ObserverEntity | undefined = observerEntities.find(item => item.target === target);
+  let entity = observerEntities.find(item => item.target === target);
 
   if (entity) {
     entity.affixList.push(affix);
diff --git a/components/style.ts b/components/style.ts
index c82d9a199..62e3cd164 100644
--- a/components/style.ts
+++ b/components/style.ts
@@ -26,7 +26,7 @@ import './spin/style';
 import './select/style';
 import './switch/style';
 import './auto-complete/style';
-import './affix/style';
+// import './affix/style';
 import './cascader/style';
 import './back-top/style';
 import './modal/style';