chore: change solution

chore: improve code

chore: improve code

Author: edison1105

packages/runtime-core/src/component.ts

@@ -284,6 +284,12 @@ export interface ComponentInternalInstance {
    */
   emitsOptions: ObjectEmitsOptions | null
 
+  /**
+   * resolved inheritAttrs options
+   * @internal
+   */
+  inheritAttrs?: boolean
+
   // the rest are only for stateful components ---------------------------------
 
   // main proxy that serves as the public instance (`this`)
@@ -464,6 +470,9 @@ export function createComponentInstance(
     // props default value
     propsDefaults: EMPTY_OBJ,
 
+    // inheritAttrs
+    inheritAttrs: type.inheritAttrs,
+
     // state
     ctx: EMPTY_OBJ,
     data: EMPTY_OBJ,

packages/runtime-core/src/componentOptions.ts

@@ -755,7 +755,7 @@ export function applyOptions(
       resolveInstanceAssets(instance, options, FILTERS)
     }
 
-    if (inheritAttrs !== undefined) instance.type.inheritAttrs = inheritAttrs
+    if (inheritAttrs !== undefined) instance.inheritAttrs = inheritAttrs
   }
 
   // lifecycle options

packages/runtime-core/src/componentRenderUtils.ts

@@ -55,7 +55,8 @@ export function renderComponentRoot(
     renderCache,
     data,
     setupState,
-    ctx
+    ctx,
+    inheritAttrs
   } = instance
 
   let result
@@ -123,7 +124,7 @@ export function renderComponentRoot(
       ;[root, setRoot] = getChildRoot(result)
     }
 
-    if (fallthroughAttrs && Component.inheritAttrs !== false) {
+    if (fallthroughAttrs && inheritAttrs !== false) {
       const keys = Object.keys(fallthroughAttrs)
       const { shapeFlag } = root
       if (keys.length) {
@@ -190,7 +191,7 @@ export function renderComponentRoot(
     ) {
       const { class: cls, style } = vnode.props || {}
       if (cls || style) {
-        if (__DEV__ && Component.inheritAttrs === false) {
+        if (__DEV__ && inheritAttrs === false) {
           warnDeprecation(
             DeprecationTypes.INSTANCE_ATTRS_CLASS_STYLE,
             instance,

packages/server-renderer/src/render.ts

@@ -128,8 +128,7 @@ function renderComponentSubTree(
     if (ssrRender) {
       // optimized
       // resolve fallthrough attrs
-      let attrs =
-        instance.type.inheritAttrs !== false ? instance.attrs : undefined
+      let attrs = instance.inheritAttrs !== false ? instance.attrs : undefined
       let hasCloned = false
 
       let cur = instance