eslint-plugin-react-hooks 6.1.0-canary-9be531cd-20250729 → 6.1.0-canary-9784cb37-20250730

package/cjs/eslint-plugin-react-hooks.development.js

@@ -22065,6 +22065,7 @@ addObject(BUILTIN_SHAPES, BuiltInUseRefId, [
 addObject(BUILTIN_SHAPES, BuiltInRefValueId, [
     ['*', { kind: 'Object', shapeId: BuiltInRefValueId }],
 ]);
+addObject(BUILTIN_SHAPES, ReanimatedSharedValueId, []);
 addFunction(BUILTIN_SHAPES, [], {
     positionalParams: [],
     restParam: Effect.ConditionallyMutate,
@@ -30682,7 +30683,7 @@ const EnvironmentConfigSchema = zod.z.object({
     enableChangeDetectionForDebugging: ExternalFunctionSchema.nullable().default(null),
     enableCustomTypeDefinitionForReanimated: zod.z.boolean().default(false),
     hookPattern: zod.z.string().nullable().default(null),
-    enableTreatRefLikeIdentifiersAsRefs: zod.z.boolean().default(false),
+    enableTreatRefLikeIdentifiersAsRefs: zod.z.boolean().default(true),
     lowerContextAccess: ExternalFunctionSchema.nullable().default(null),
     validateNoVoidUseMemo: zod.z.boolean().default(false),
 });
@@ -44060,12 +44061,6 @@ class StableSidemap {
                         });
                     }
                 }
-                else if (this.env.config.enableTreatRefLikeIdentifiersAsRefs &&
-                    isUseRefType(lvalue.identifier)) {
-                    this.map.set(lvalue.identifier.id, {
-                        isStable: true,
-                    });
-                }
                 break;
             }
             case 'Destructure':
@@ -45244,7 +45239,7 @@ function makeOrMergeProperty(node, property, accessType) {
 var _DependencyCollectionContext_instances, _DependencyCollectionContext_declarations, _DependencyCollectionContext_reassignments, _DependencyCollectionContext_scopes, _DependencyCollectionContext_dependencies, _DependencyCollectionContext_temporaries, _DependencyCollectionContext_temporariesUsedOutsideScope, _DependencyCollectionContext_processedInstrsInOptional, _DependencyCollectionContext_innerFnContext, _DependencyCollectionContext_checkValidDependency, _DependencyCollectionContext_isScopeActive;
 function propagateScopeDependenciesHIR(fn) {
     const usedOutsideDeclaringScope = findTemporariesUsedOutsideDeclaringScope(fn);
-    const temporaries = collectTemporariesSidemap(fn, usedOutsideDeclaringScope);
+    const temporaries = collectTemporariesSidemap$1(fn, usedOutsideDeclaringScope);
     const { temporariesReadInOptional, processedInstrsInOptional, hoistableObjects, } = collectOptionalChainSidemap(fn);
     const hoistablePropertyLoads = keyByScopeId(fn, collectHoistablePropertyLoads(fn, temporaries, hoistableObjects));
     const scopeDeps = collectDependencies(fn, usedOutsideDeclaringScope, new Map([...temporaries, ...temporariesReadInOptional]), processedInstrsInOptional);
@@ -45315,7 +45310,7 @@ function findTemporariesUsedOutsideDeclaringScope(fn) {
     }
     return usedOutsideDeclaringScope;
 }
-function collectTemporariesSidemap(fn, usedOutsideDeclaringScope) {
+function collectTemporariesSidemap$1(fn, usedOutsideDeclaringScope) {
     const temporaries = new Map();
     collectTemporariesSidemapImpl(fn, usedOutsideDeclaringScope, temporaries, null);
     return temporaries;
@@ -46140,7 +46135,7 @@ function collectDepUsages(deps, fnExpr) {
 }
 function inferMinimalDependencies(fnInstr) {
     const fn = fnInstr.value.loweredFunc.func;
-    const temporaries = collectTemporariesSidemap(fn, new Set());
+    const temporaries = collectTemporariesSidemap$1(fn, new Set());
     const { hoistableObjects, processedInstrsInOptional, temporariesReadInOptional, } = collectOptionalChainSidemap(fn);
     const hoistablePropertyLoads = collectHoistablePropertyLoadsInInnerFn(fnInstr, temporaries, hoistableObjects);
     const hoistableToFnEntry = hoistablePropertyLoads.get(fn.body.entry);
@@ -47308,6 +47303,18 @@ function* generateInstructionTypes(env, names, instr) {
         }
         case 'JsxExpression':
         case 'JsxFragment': {
+            if (env.config.enableTreatRefLikeIdentifiersAsRefs) {
+                if (value.kind === 'JsxExpression') {
+                    for (const prop of value.props) {
+                        if (prop.kind === 'JsxAttribute' && prop.name === 'ref') {
+                            yield equation(prop.place.identifier.type, {
+                                kind: 'Object',
+                                shapeId: BuiltInUseRefId,
+                            });
+                        }
+                    }
+                }
+            }
             yield equation(left, { kind: 'Object', shapeId: BuiltInJsxId });
             break;
         }
@@ -47322,7 +47329,18 @@ function* generateInstructionTypes(env, names, instr) {
             yield equation(left, returnType);
             break;
         }
-        case 'PropertyStore':
+        case 'PropertyStore': {
+            yield equation(makeType(), {
+                kind: 'Property',
+                objectType: value.object.identifier.type,
+                objectName: getName(names, value.object.identifier.id),
+                propertyName: {
+                    kind: 'literal',
+                    value: value.property,
+                },
+            });
+            break;
+        }
         case 'DeclareLocal':
         case 'RegExpLiteral':
         case 'MetaProperty':
@@ -48083,7 +48101,7 @@ function validateNoCapitalizedCalls(fn) {
     return errors.asResult();
 }
 
-var _Env_changed;
+var _Env_changed, _Env_data, _Env_temporaries;
 function makeRefId(id) {
     CompilerError.invariant(id >= 0 && Number.isInteger(id), {
         reason: 'Expected identifier id to be a non-negative integer',
@@ -48097,10 +48115,18 @@ let _refId = 0;
 function nextRefId() {
     return makeRefId(_refId++);
 }
-class Env extends Map {
+class Env {
     constructor() {
-        super(...arguments);
         _Env_changed.set(this, false);
+        _Env_data.set(this, new Map());
+        _Env_temporaries.set(this, new Map());
+    }
+    lookup(place) {
+        var _a;
+        return (_a = __classPrivateFieldGet(this, _Env_temporaries, "f").get(place.identifier.id)) !== null && _a !== void 0 ? _a : place;
+    }
+    define(place, value) {
+        __classPrivateFieldGet(this, _Env_temporaries, "f").set(place.identifier.id, value);
     }
     resetChanged() {
         __classPrivateFieldSet(this, _Env_changed, false, "f");
@@ -48108,21 +48134,65 @@ class Env extends Map {
     hasChanged() {
         return __classPrivateFieldGet(this, _Env_changed, "f");
     }
+    get(key) {
+        var _a, _b;
+        const operandId = (_b = (_a = __classPrivateFieldGet(this, _Env_temporaries, "f").get(key)) === null || _a === void 0 ? void 0 : _a.identifier.id) !== null && _b !== void 0 ? _b : key;
+        return __classPrivateFieldGet(this, _Env_data, "f").get(operandId);
+    }
     set(key, value) {
-        const cur = this.get(key);
+        var _a, _b;
+        const operandId = (_b = (_a = __classPrivateFieldGet(this, _Env_temporaries, "f").get(key)) === null || _a === void 0 ? void 0 : _a.identifier.id) !== null && _b !== void 0 ? _b : key;
+        const cur = __classPrivateFieldGet(this, _Env_data, "f").get(operandId);
         const widenedValue = joinRefAccessTypes(value, cur !== null && cur !== void 0 ? cur : { kind: 'None' });
         if (!(cur == null && widenedValue.kind === 'None') &&
             (cur == null || !tyEqual(cur, widenedValue))) {
             __classPrivateFieldSet(this, _Env_changed, true, "f");
         }
-        return super.set(key, widenedValue);
+        __classPrivateFieldGet(this, _Env_data, "f").set(operandId, widenedValue);
+        return this;
     }
 }
-_Env_changed = new WeakMap();
+_Env_changed = new WeakMap(), _Env_data = new WeakMap(), _Env_temporaries = new WeakMap();
 function validateNoRefAccessInRender(fn) {
     const env = new Env();
+    collectTemporariesSidemap(fn, env);
     return validateNoRefAccessInRenderImpl(fn, env).map(_ => undefined);
 }
+function collectTemporariesSidemap(fn, env) {
+    for (const block of fn.body.blocks.values()) {
+        for (const instr of block.instructions) {
+            const { lvalue, value } = instr;
+            switch (value.kind) {
+                case 'LoadLocal': {
+                    const temp = env.lookup(value.place);
+                    if (temp != null) {
+                        env.define(lvalue, temp);
+                    }
+                    break;
+                }
+                case 'StoreLocal': {
+                    const temp = env.lookup(value.value);
+                    if (temp != null) {
+                        env.define(lvalue, temp);
+                        env.define(value.lvalue.place, temp);
+                    }
+                    break;
+                }
+                case 'PropertyLoad': {
+                    if (isUseRefType(value.object.identifier) &&
+                        value.property === 'current') {
+                        continue;
+                    }
+                    const temp = env.lookup(value.object);
+                    if (temp != null) {
+                        env.define(lvalue, temp);
+                    }
+                    break;
+                }
+            }
+        }
+    }
+}
 function refTypeOfType(place) {
     if (isRefValueType(place.identifier)) {
         return { kind: 'RefValue' };
@@ -48266,12 +48336,26 @@ function validateNoRefAccessInRenderImpl(fn, env) {
         const type = refTypeOfType(place);
         env.set(place.identifier.id, type);
     }
+    const interpolatedAsJsx = new Set();
+    for (const block of fn.body.blocks.values()) {
+        for (const instr of block.instructions) {
+            const { value } = instr;
+            if (value.kind === 'JsxExpression' || value.kind === 'JsxFragment') {
+                if (value.children != null) {
+                    for (const child of value.children) {
+                        interpolatedAsJsx.add(child.identifier.id);
+                    }
+                }
+            }
+        }
+    }
     for (let i = 0; (i == 0 || env.hasChanged()) && i < 10; i++) {
         env.resetChanged();
         returnValues = [];
-        const safeBlocks = new Map();
+        const safeBlocks = [];
         const errors = new CompilerError();
         for (const [, block] of fn.body.blocks) {
+            retainWhere(safeBlocks, entry => entry.block !== block.id);
             for (const phi of block.phis) {
                 env.set(phi.place.identifier.id, joinRefAccessTypes(...Array(...phi.operands.values()).map(operand => { var _a; return (_a = env.get(operand.identifier.id)) !== null && _a !== void 0 ? _a : { kind: 'None' }; })));
             }
@@ -48360,27 +48444,37 @@ function validateNoRefAccessInRenderImpl(fn, env) {
                         const hookKind = getHookKindForType(fn.env, callee.identifier.type);
                         let returnType = { kind: 'None' };
                         const fnType = env.get(callee.identifier.id);
+                        let didError = false;
                         if ((fnType === null || fnType === void 0 ? void 0 : fnType.kind) === 'Structure' && fnType.fn !== null) {
                             returnType = fnType.fn.returnType;
                             if (fnType.fn.readRefEffect) {
-                                errors.push({
+                                didError = true;
+                                errors.pushDiagnostic(CompilerDiagnostic.create({
                                     severity: ErrorSeverity.InvalidReact,
-                                    reason: 'This function accesses a ref value (the `current` property), which may not be accessed during render. (https://react.dev/reference/react/useRef)',
+                                    category: 'Cannot access refs during render',
+                                    description: ERROR_DESCRIPTION,
+                                }).withDetail({
+                                    kind: 'error',
                                     loc: callee.loc,
-                                    description: callee.identifier.name !== null &&
-                                        callee.identifier.name.kind === 'named'
-                                        ? `Function \`${callee.identifier.name.value}\` accesses a ref`
-                                        : null,
-                                    suggestions: null,
-                                });
+                                    message: `This function accesses a ref value`,
+                                }));
                             }
                         }
-                        for (const operand of eachInstructionValueOperand(instr.value)) {
-                            if (hookKind != null) {
-                                validateNoDirectRefValueAccess(errors, operand, env);
-                            }
-                            else {
-                                validateNoRefAccess(errors, env, operand, operand.loc);
+                        if (!didError) {
+                            const isRefLValue = isUseRefType(instr.lvalue.identifier);
+                            for (const operand of eachInstructionValueOperand(instr.value)) {
+                                if (isRefLValue ||
+                                    (hookKind != null &&
+                                        hookKind !== 'useState' &&
+                                        hookKind !== 'useReducer')) {
+                                    validateNoDirectRefValueAccess(errors, operand, env);
+                                }
+                                else if (interpolatedAsJsx.has(instr.lvalue.identifier.id)) {
+                                    validateNoRefValueAccess(errors, env, operand);
+                                }
+                                else {
+                                    validateNoRefPassedToFunction(errors, env, operand, operand.loc);
+                                }
                             }
                         }
                         env.set(instr.lvalue.identifier.id, returnType);
@@ -48412,22 +48506,34 @@ function validateNoRefAccessInRenderImpl(fn, env) {
                     case 'PropertyStore':
                     case 'ComputedDelete':
                     case 'ComputedStore': {
-                        const safe = safeBlocks.get(block.id);
                         const target = env.get(instr.value.object.identifier.id);
+                        let safe = null;
                         if (instr.value.kind === 'PropertyStore' &&
-                            safe != null &&
-                            (target === null || target === void 0 ? void 0 : target.kind) === 'Ref' &&
-                            target.refId === safe) {
-                            safeBlocks.delete(block.id);
+                            target != null &&
+                            target.kind === 'Ref') {
+                            safe = safeBlocks.find(entry => entry.ref === target.refId);
+                        }
+                        if (safe != null) {
+                            retainWhere(safeBlocks, entry => entry !== safe);
                         }
                         else {
-                            validateNoRefAccess(errors, env, instr.value.object, instr.loc);
+                            validateNoRefUpdate(errors, env, instr.value.object, instr.loc);
                         }
-                        for (const operand of eachInstructionValueOperand(instr.value)) {
-                            if (operand === instr.value.object) {
-                                continue;
+                        if (instr.value.kind === 'ComputedDelete' ||
+                            instr.value.kind === 'ComputedStore') {
+                            validateNoRefValueAccess(errors, env, instr.value.property);
+                        }
+                        if (instr.value.kind === 'ComputedStore' ||
+                            instr.value.kind === 'PropertyStore') {
+                            validateNoDirectRefValueAccess(errors, instr.value.value, env);
+                            const type = env.get(instr.value.value.identifier.id);
+                            if (type != null && type.kind === 'Structure') {
+                                let objectType = type;
+                                if (target != null) {
+                                    objectType = joinRefAccessTypes(objectType, target);
+                                }
+                                env.set(instr.value.object.identifier.id, objectType);
                             }
-                            validateNoRefValueAccess(errors, env, operand);
                         }
                         break;
                     }
@@ -48488,8 +48594,9 @@ function validateNoRefAccessInRenderImpl(fn, env) {
             }
             if (block.terminal.kind === 'if') {
                 const test = env.get(block.terminal.test.identifier.id);
-                if ((test === null || test === void 0 ? void 0 : test.kind) === 'Guard') {
-                    safeBlocks.set(block.terminal.consequent, test.refId);
+                if ((test === null || test === void 0 ? void 0 : test.kind) === 'Guard' &&
+                    safeBlocks.find(entry => entry.ref === test.refId) == null) {
+                    safeBlocks.push({ block: block.terminal.fallthrough, ref: test.refId });
                 }
             }
             for (const operand of eachTerminalOperand(block.terminal)) {
@@ -48525,16 +48632,15 @@ function destructure(type) {
 function guardCheck(errors, operand, env) {
     var _a;
     if (((_a = env.get(operand.identifier.id)) === null || _a === void 0 ? void 0 : _a.kind) === 'Guard') {
-        errors.push({
+        errors.pushDiagnostic(CompilerDiagnostic.create({
             severity: ErrorSeverity.InvalidReact,
-            reason: 'Ref values (the `current` property) may not be accessed during render. (https://react.dev/reference/react/useRef)',
+            category: 'Cannot access refs during render',
+            description: ERROR_DESCRIPTION,
+        }).withDetail({
+            kind: 'error',
             loc: operand.loc,
-            description: operand.identifier.name !== null &&
-                operand.identifier.name.kind === 'named'
-                ? `Cannot access ref value \`${operand.identifier.name.value}\``
-                : null,
-            suggestions: null,
-        });
+            message: `Cannot access ref value during render`,
+        }));
     }
 }
 function validateNoRefValueAccess(errors, env, operand) {
@@ -48542,52 +48648,67 @@ function validateNoRefValueAccess(errors, env, operand) {
     const type = destructure(env.get(operand.identifier.id));
     if ((type === null || type === void 0 ? void 0 : type.kind) === 'RefValue' ||
         ((type === null || type === void 0 ? void 0 : type.kind) === 'Structure' && ((_a = type.fn) === null || _a === void 0 ? void 0 : _a.readRefEffect))) {
-        errors.push({
+        errors.pushDiagnostic(CompilerDiagnostic.create({
             severity: ErrorSeverity.InvalidReact,
-            reason: 'Ref values (the `current` property) may not be accessed during render. (https://react.dev/reference/react/useRef)',
+            category: 'Cannot access refs during render',
+            description: ERROR_DESCRIPTION,
+        }).withDetail({
+            kind: 'error',
             loc: (type.kind === 'RefValue' && type.loc) || operand.loc,
-            description: operand.identifier.name !== null &&
-                operand.identifier.name.kind === 'named'
-                ? `Cannot access ref value \`${operand.identifier.name.value}\``
-                : null,
-            suggestions: null,
-        });
+            message: `Cannot access ref value during render`,
+        }));
     }
 }
-function validateNoRefAccess(errors, env, operand, loc) {
+function validateNoRefPassedToFunction(errors, env, operand, loc) {
     var _a;
     const type = destructure(env.get(operand.identifier.id));
     if ((type === null || type === void 0 ? void 0 : type.kind) === 'Ref' ||
         (type === null || type === void 0 ? void 0 : type.kind) === 'RefValue' ||
         ((type === null || type === void 0 ? void 0 : type.kind) === 'Structure' && ((_a = type.fn) === null || _a === void 0 ? void 0 : _a.readRefEffect))) {
-        errors.push({
+        errors.pushDiagnostic(CompilerDiagnostic.create({
+            severity: ErrorSeverity.InvalidReact,
+            category: 'Cannot access refs during render',
+            description: ERROR_DESCRIPTION,
+        }).withDetail({
+            kind: 'error',
+            loc: (type.kind === 'RefValue' && type.loc) || loc,
+            message: `Passing a ref to a function may read its value during render`,
+        }));
+    }
+}
+function validateNoRefUpdate(errors, env, operand, loc) {
+    const type = destructure(env.get(operand.identifier.id));
+    if ((type === null || type === void 0 ? void 0 : type.kind) === 'Ref' || (type === null || type === void 0 ? void 0 : type.kind) === 'RefValue') {
+        errors.pushDiagnostic(CompilerDiagnostic.create({
             severity: ErrorSeverity.InvalidReact,
-            reason: 'Ref values (the `current` property) may not be accessed during render. (https://react.dev/reference/react/useRef)',
+            category: 'Cannot access refs during render',
+            description: ERROR_DESCRIPTION,
+        }).withDetail({
+            kind: 'error',
             loc: (type.kind === 'RefValue' && type.loc) || loc,
-            description: operand.identifier.name !== null &&
-                operand.identifier.name.kind === 'named'
-                ? `Cannot access ref value \`${operand.identifier.name.value}\``
-                : null,
-            suggestions: null,
-        });
+            message: `Cannot update ref during render`,
+        }));
     }
 }
 function validateNoDirectRefValueAccess(errors, operand, env) {
     var _a;
     const type = destructure(env.get(operand.identifier.id));
     if ((type === null || type === void 0 ? void 0 : type.kind) === 'RefValue') {
-        errors.push({
+        errors.pushDiagnostic(CompilerDiagnostic.create({
             severity: ErrorSeverity.InvalidReact,
-            reason: 'Ref values (the `current` property) may not be accessed during render. (https://react.dev/reference/react/useRef)',
+            category: 'Cannot access refs during render',
+            description: ERROR_DESCRIPTION,
+        }).withDetail({
+            kind: 'error',
             loc: (_a = type.loc) !== null && _a !== void 0 ? _a : operand.loc,
-            description: operand.identifier.name !== null &&
-                operand.identifier.name.kind === 'named'
-                ? `Cannot access ref value \`${operand.identifier.name.value}\``
-                : null,
-            suggestions: null,
-        });
+            message: `Cannot access ref value during render`,
+        }));
     }
 }
+const ERROR_DESCRIPTION = 'React refs are values that are not needed for rendering. Refs should only be accessed ' +
+    'outside of render, such as in event handlers or effects. ' +
+    'Accessing a ref value (the `current` property) during render can cause your component ' +
+    'not to update as expected (https://react.dev/reference/react/useRef)';
 
 function validateNoSetStateInRender(fn) {
     const unconditionalSetStateFunctions = new Set();
@@ -52676,7 +52797,7 @@ const COMPILER_OPTIONS = {
     panicThreshold: 'none',
     flowSuppressions: false,
     environment: validateEnvironmentConfig({
-        validateRefAccessDuringRender: false,
+        validateRefAccessDuringRender: true,
         validateNoSetStateInRender: true,
         validateNoSetStateInEffects: true,
         validateNoJSXInTryStatements: true,
@@ -55745,6 +55866,15 @@ function isInsideDoWhileLoop(node) {
     }
     return false;
 }
+function isInsideTryCatch(node) {
+    while (node) {
+        if (node.type === 'TryStatement' || node.type === 'CatchClause') {
+            return true;
+        }
+        node = node.parent;
+    }
+    return false;
+}
 function isUseEffectEventIdentifier(node) {
     return false;
 }
@@ -55946,6 +56076,12 @@ const rule = {
                         if (hasFlowSuppression(hook, 'react-rule-hook')) {
                             continue;
                         }
+                        if (isUseIdentifier(hook) && isInsideTryCatch(hook)) {
+                            context.report({
+                                node: hook,
+                                message: `React Hook "${getSourceCode().getText(hook)}" cannot be called in a try/catch block.`,
+                            });
+                        }
                         if ((cycled || isInsideDoWhileLoop(hook)) &&
                             !isUseIdentifier(hook)) {
                             context.report({

package/cjs/eslint-plugin-react-hooks.production.js

@@ -22056,6 +22056,7 @@ addObject(BUILTIN_SHAPES, BuiltInUseRefId, [
 addObject(BUILTIN_SHAPES, BuiltInRefValueId, [
     ['*', { kind: 'Object', shapeId: BuiltInRefValueId }],
 ]);
+addObject(BUILTIN_SHAPES, ReanimatedSharedValueId, []);
 addFunction(BUILTIN_SHAPES, [], {
     positionalParams: [],
     restParam: Effect.ConditionallyMutate,
@@ -30509,7 +30510,7 @@ const EnvironmentConfigSchema = zod.z.object({
     enableChangeDetectionForDebugging: ExternalFunctionSchema.nullable().default(null),
     enableCustomTypeDefinitionForReanimated: zod.z.boolean().default(false),
     hookPattern: zod.z.string().nullable().default(null),
-    enableTreatRefLikeIdentifiersAsRefs: zod.z.boolean().default(false),
+    enableTreatRefLikeIdentifiersAsRefs: zod.z.boolean().default(true),
     lowerContextAccess: ExternalFunctionSchema.nullable().default(null),
     validateNoVoidUseMemo: zod.z.boolean().default(false),
 });
@@ -43887,12 +43888,6 @@ class StableSidemap {
                         });
                     }
                 }
-                else if (this.env.config.enableTreatRefLikeIdentifiersAsRefs &&
-                    isUseRefType(lvalue.identifier)) {
-                    this.map.set(lvalue.identifier.id, {
-                        isStable: true,
-                    });
-                }
                 break;
             }
             case 'Destructure':
@@ -45071,7 +45066,7 @@ function makeOrMergeProperty(node, property, accessType) {
 var _DependencyCollectionContext_instances, _DependencyCollectionContext_declarations, _DependencyCollectionContext_reassignments, _DependencyCollectionContext_scopes, _DependencyCollectionContext_dependencies, _DependencyCollectionContext_temporaries, _DependencyCollectionContext_temporariesUsedOutsideScope, _DependencyCollectionContext_processedInstrsInOptional, _DependencyCollectionContext_innerFnContext, _DependencyCollectionContext_checkValidDependency, _DependencyCollectionContext_isScopeActive;
 function propagateScopeDependenciesHIR(fn) {
     const usedOutsideDeclaringScope = findTemporariesUsedOutsideDeclaringScope(fn);
-    const temporaries = collectTemporariesSidemap(fn, usedOutsideDeclaringScope);
+    const temporaries = collectTemporariesSidemap$1(fn, usedOutsideDeclaringScope);
     const { temporariesReadInOptional, processedInstrsInOptional, hoistableObjects, } = collectOptionalChainSidemap(fn);
     const hoistablePropertyLoads = keyByScopeId(fn, collectHoistablePropertyLoads(fn, temporaries, hoistableObjects));
     const scopeDeps = collectDependencies(fn, usedOutsideDeclaringScope, new Map([...temporaries, ...temporariesReadInOptional]), processedInstrsInOptional);
@@ -45142,7 +45137,7 @@ function findTemporariesUsedOutsideDeclaringScope(fn) {
     }
     return usedOutsideDeclaringScope;
 }
-function collectTemporariesSidemap(fn, usedOutsideDeclaringScope) {
+function collectTemporariesSidemap$1(fn, usedOutsideDeclaringScope) {
     const temporaries = new Map();
     collectTemporariesSidemapImpl(fn, usedOutsideDeclaringScope, temporaries, null);
     return temporaries;
@@ -45967,7 +45962,7 @@ function collectDepUsages(deps, fnExpr) {
 }
 function inferMinimalDependencies(fnInstr) {
     const fn = fnInstr.value.loweredFunc.func;
-    const temporaries = collectTemporariesSidemap(fn, new Set());
+    const temporaries = collectTemporariesSidemap$1(fn, new Set());
     const { hoistableObjects, processedInstrsInOptional, temporariesReadInOptional, } = collectOptionalChainSidemap(fn);
     const hoistablePropertyLoads = collectHoistablePropertyLoadsInInnerFn(fnInstr, temporaries, hoistableObjects);
     const hoistableToFnEntry = hoistablePropertyLoads.get(fn.body.entry);
@@ -47135,6 +47130,18 @@ function* generateInstructionTypes(env, names, instr) {
         }
         case 'JsxExpression':
         case 'JsxFragment': {
+            if (env.config.enableTreatRefLikeIdentifiersAsRefs) {
+                if (value.kind === 'JsxExpression') {
+                    for (const prop of value.props) {
+                        if (prop.kind === 'JsxAttribute' && prop.name === 'ref') {
+                            yield equation(prop.place.identifier.type, {
+                                kind: 'Object',
+                                shapeId: BuiltInUseRefId,
+                            });
+                        }
+                    }
+                }
+            }
             yield equation(left, { kind: 'Object', shapeId: BuiltInJsxId });
             break;
         }
@@ -47149,7 +47156,18 @@ function* generateInstructionTypes(env, names, instr) {
             yield equation(left, returnType);
             break;
         }
-        case 'PropertyStore':
+        case 'PropertyStore': {
+            yield equation(makeType(), {
+                kind: 'Property',
+                objectType: value.object.identifier.type,
+                objectName: getName(names, value.object.identifier.id),
+                propertyName: {
+                    kind: 'literal',
+                    value: value.property,
+                },
+            });
+            break;
+        }
         case 'DeclareLocal':
         case 'RegExpLiteral':
         case 'MetaProperty':
@@ -47910,7 +47928,7 @@ function validateNoCapitalizedCalls(fn) {
     return errors.asResult();
 }
 
-var _Env_changed;
+var _Env_changed, _Env_data, _Env_temporaries;
 function makeRefId(id) {
     CompilerError.invariant(id >= 0 && Number.isInteger(id), {
         reason: 'Expected identifier id to be a non-negative integer',
@@ -47924,10 +47942,18 @@ let _refId = 0;
 function nextRefId() {
     return makeRefId(_refId++);
 }
-class Env extends Map {
+class Env {
     constructor() {
-        super(...arguments);
         _Env_changed.set(this, false);
+        _Env_data.set(this, new Map());
+        _Env_temporaries.set(this, new Map());
+    }
+    lookup(place) {
+        var _a;
+        return (_a = __classPrivateFieldGet(this, _Env_temporaries, "f").get(place.identifier.id)) !== null && _a !== void 0 ? _a : place;
+    }
+    define(place, value) {
+        __classPrivateFieldGet(this, _Env_temporaries, "f").set(place.identifier.id, value);
     }
     resetChanged() {
         __classPrivateFieldSet(this, _Env_changed, false, "f");
@@ -47935,21 +47961,65 @@ class Env extends Map {
     hasChanged() {
         return __classPrivateFieldGet(this, _Env_changed, "f");
     }
+    get(key) {
+        var _a, _b;
+        const operandId = (_b = (_a = __classPrivateFieldGet(this, _Env_temporaries, "f").get(key)) === null || _a === void 0 ? void 0 : _a.identifier.id) !== null && _b !== void 0 ? _b : key;
+        return __classPrivateFieldGet(this, _Env_data, "f").get(operandId);
+    }
     set(key, value) {
-        const cur = this.get(key);
+        var _a, _b;
+        const operandId = (_b = (_a = __classPrivateFieldGet(this, _Env_temporaries, "f").get(key)) === null || _a === void 0 ? void 0 : _a.identifier.id) !== null && _b !== void 0 ? _b : key;
+        const cur = __classPrivateFieldGet(this, _Env_data, "f").get(operandId);
         const widenedValue = joinRefAccessTypes(value, cur !== null && cur !== void 0 ? cur : { kind: 'None' });
         if (!(cur == null && widenedValue.kind === 'None') &&
             (cur == null || !tyEqual(cur, widenedValue))) {
             __classPrivateFieldSet(this, _Env_changed, true, "f");
         }
-        return super.set(key, widenedValue);
+        __classPrivateFieldGet(this, _Env_data, "f").set(operandId, widenedValue);
+        return this;
     }
 }
-_Env_changed = new WeakMap();
+_Env_changed = new WeakMap(), _Env_data = new WeakMap(), _Env_temporaries = new WeakMap();
 function validateNoRefAccessInRender(fn) {
     const env = new Env();
+    collectTemporariesSidemap(fn, env);
     return validateNoRefAccessInRenderImpl(fn, env).map(_ => undefined);
 }
+function collectTemporariesSidemap(fn, env) {
+    for (const block of fn.body.blocks.values()) {
+        for (const instr of block.instructions) {
+            const { lvalue, value } = instr;
+            switch (value.kind) {
+                case 'LoadLocal': {
+                    const temp = env.lookup(value.place);
+                    if (temp != null) {
+                        env.define(lvalue, temp);
+                    }
+                    break;
+                }
+                case 'StoreLocal': {
+                    const temp = env.lookup(value.value);
+                    if (temp != null) {
+                        env.define(lvalue, temp);
+                        env.define(value.lvalue.place, temp);
+                    }
+                    break;
+                }
+                case 'PropertyLoad': {
+                    if (isUseRefType(value.object.identifier) &&
+                        value.property === 'current') {
+                        continue;
+                    }
+                    const temp = env.lookup(value.object);
+                    if (temp != null) {
+                        env.define(lvalue, temp);
+                    }
+                    break;
+                }
+            }
+        }
+    }
+}
 function refTypeOfType(place) {
     if (isRefValueType(place.identifier)) {
         return { kind: 'RefValue' };
@@ -48093,12 +48163,26 @@ function validateNoRefAccessInRenderImpl(fn, env) {
         const type = refTypeOfType(place);
         env.set(place.identifier.id, type);
     }
+    const interpolatedAsJsx = new Set();
+    for (const block of fn.body.blocks.values()) {
+        for (const instr of block.instructions) {
+            const { value } = instr;
+            if (value.kind === 'JsxExpression' || value.kind === 'JsxFragment') {
+                if (value.children != null) {
+                    for (const child of value.children) {
+                        interpolatedAsJsx.add(child.identifier.id);
+                    }
+                }
+            }
+        }
+    }
     for (let i = 0; (i == 0 || env.hasChanged()) && i < 10; i++) {
         env.resetChanged();
         returnValues = [];
-        const safeBlocks = new Map();
+        const safeBlocks = [];
         const errors = new CompilerError();
         for (const [, block] of fn.body.blocks) {
+            retainWhere(safeBlocks, entry => entry.block !== block.id);
             for (const phi of block.phis) {
                 env.set(phi.place.identifier.id, joinRefAccessTypes(...Array(...phi.operands.values()).map(operand => { var _a; return (_a = env.get(operand.identifier.id)) !== null && _a !== void 0 ? _a : { kind: 'None' }; })));
             }
@@ -48187,27 +48271,37 @@ function validateNoRefAccessInRenderImpl(fn, env) {
                         const hookKind = getHookKindForType(fn.env, callee.identifier.type);
                         let returnType = { kind: 'None' };
                         const fnType = env.get(callee.identifier.id);
+                        let didError = false;
                         if ((fnType === null || fnType === void 0 ? void 0 : fnType.kind) === 'Structure' && fnType.fn !== null) {
                             returnType = fnType.fn.returnType;
                             if (fnType.fn.readRefEffect) {
-                                errors.push({
+                                didError = true;
+                                errors.pushDiagnostic(CompilerDiagnostic.create({
                                     severity: ErrorSeverity.InvalidReact,
-                                    reason: 'This function accesses a ref value (the `current` property), which may not be accessed during render. (https://react.dev/reference/react/useRef)',
+                                    category: 'Cannot access refs during render',
+                                    description: ERROR_DESCRIPTION,
+                                }).withDetail({
+                                    kind: 'error',
                                     loc: callee.loc,
-                                    description: callee.identifier.name !== null &&
-                                        callee.identifier.name.kind === 'named'
-                                        ? `Function \`${callee.identifier.name.value}\` accesses a ref`
-                                        : null,
-                                    suggestions: null,
-                                });
+                                    message: `This function accesses a ref value`,
+                                }));
                             }
                         }
-                        for (const operand of eachInstructionValueOperand(instr.value)) {
-                            if (hookKind != null) {
-                                validateNoDirectRefValueAccess(errors, operand, env);
-                            }
-                            else {
-                                validateNoRefAccess(errors, env, operand, operand.loc);
+                        if (!didError) {
+                            const isRefLValue = isUseRefType(instr.lvalue.identifier);
+                            for (const operand of eachInstructionValueOperand(instr.value)) {
+                                if (isRefLValue ||
+                                    (hookKind != null &&
+                                        hookKind !== 'useState' &&
+                                        hookKind !== 'useReducer')) {
+                                    validateNoDirectRefValueAccess(errors, operand, env);
+                                }
+                                else if (interpolatedAsJsx.has(instr.lvalue.identifier.id)) {
+                                    validateNoRefValueAccess(errors, env, operand);
+                                }
+                                else {
+                                    validateNoRefPassedToFunction(errors, env, operand, operand.loc);
+                                }
                             }
                         }
                         env.set(instr.lvalue.identifier.id, returnType);
@@ -48239,22 +48333,34 @@ function validateNoRefAccessInRenderImpl(fn, env) {
                     case 'PropertyStore':
                     case 'ComputedDelete':
                     case 'ComputedStore': {
-                        const safe = safeBlocks.get(block.id);
                         const target = env.get(instr.value.object.identifier.id);
+                        let safe = null;
                         if (instr.value.kind === 'PropertyStore' &&
-                            safe != null &&
-                            (target === null || target === void 0 ? void 0 : target.kind) === 'Ref' &&
-                            target.refId === safe) {
-                            safeBlocks.delete(block.id);
+                            target != null &&
+                            target.kind === 'Ref') {
+                            safe = safeBlocks.find(entry => entry.ref === target.refId);
+                        }
+                        if (safe != null) {
+                            retainWhere(safeBlocks, entry => entry !== safe);
                         }
                         else {
-                            validateNoRefAccess(errors, env, instr.value.object, instr.loc);
+                            validateNoRefUpdate(errors, env, instr.value.object, instr.loc);
                         }
-                        for (const operand of eachInstructionValueOperand(instr.value)) {
-                            if (operand === instr.value.object) {
-                                continue;
+                        if (instr.value.kind === 'ComputedDelete' ||
+                            instr.value.kind === 'ComputedStore') {
+                            validateNoRefValueAccess(errors, env, instr.value.property);
+                        }
+                        if (instr.value.kind === 'ComputedStore' ||
+                            instr.value.kind === 'PropertyStore') {
+                            validateNoDirectRefValueAccess(errors, instr.value.value, env);
+                            const type = env.get(instr.value.value.identifier.id);
+                            if (type != null && type.kind === 'Structure') {
+                                let objectType = type;
+                                if (target != null) {
+                                    objectType = joinRefAccessTypes(objectType, target);
+                                }
+                                env.set(instr.value.object.identifier.id, objectType);
                             }
-                            validateNoRefValueAccess(errors, env, operand);
                         }
                         break;
                     }
@@ -48315,8 +48421,9 @@ function validateNoRefAccessInRenderImpl(fn, env) {
             }
             if (block.terminal.kind === 'if') {
                 const test = env.get(block.terminal.test.identifier.id);
-                if ((test === null || test === void 0 ? void 0 : test.kind) === 'Guard') {
-                    safeBlocks.set(block.terminal.consequent, test.refId);
+                if ((test === null || test === void 0 ? void 0 : test.kind) === 'Guard' &&
+                    safeBlocks.find(entry => entry.ref === test.refId) == null) {
+                    safeBlocks.push({ block: block.terminal.fallthrough, ref: test.refId });
                 }
             }
             for (const operand of eachTerminalOperand(block.terminal)) {
@@ -48352,16 +48459,15 @@ function destructure(type) {
 function guardCheck(errors, operand, env) {
     var _a;
     if (((_a = env.get(operand.identifier.id)) === null || _a === void 0 ? void 0 : _a.kind) === 'Guard') {
-        errors.push({
+        errors.pushDiagnostic(CompilerDiagnostic.create({
             severity: ErrorSeverity.InvalidReact,
-            reason: 'Ref values (the `current` property) may not be accessed during render. (https://react.dev/reference/react/useRef)',
+            category: 'Cannot access refs during render',
+            description: ERROR_DESCRIPTION,
+        }).withDetail({
+            kind: 'error',
             loc: operand.loc,
-            description: operand.identifier.name !== null &&
-                operand.identifier.name.kind === 'named'
-                ? `Cannot access ref value \`${operand.identifier.name.value}\``
-                : null,
-            suggestions: null,
-        });
+            message: `Cannot access ref value during render`,
+        }));
     }
 }
 function validateNoRefValueAccess(errors, env, operand) {
@@ -48369,52 +48475,67 @@ function validateNoRefValueAccess(errors, env, operand) {
     const type = destructure(env.get(operand.identifier.id));
     if ((type === null || type === void 0 ? void 0 : type.kind) === 'RefValue' ||
         ((type === null || type === void 0 ? void 0 : type.kind) === 'Structure' && ((_a = type.fn) === null || _a === void 0 ? void 0 : _a.readRefEffect))) {
-        errors.push({
+        errors.pushDiagnostic(CompilerDiagnostic.create({
             severity: ErrorSeverity.InvalidReact,
-            reason: 'Ref values (the `current` property) may not be accessed during render. (https://react.dev/reference/react/useRef)',
+            category: 'Cannot access refs during render',
+            description: ERROR_DESCRIPTION,
+        }).withDetail({
+            kind: 'error',
             loc: (type.kind === 'RefValue' && type.loc) || operand.loc,
-            description: operand.identifier.name !== null &&
-                operand.identifier.name.kind === 'named'
-                ? `Cannot access ref value \`${operand.identifier.name.value}\``
-                : null,
-            suggestions: null,
-        });
+            message: `Cannot access ref value during render`,
+        }));
     }
 }
-function validateNoRefAccess(errors, env, operand, loc) {
+function validateNoRefPassedToFunction(errors, env, operand, loc) {
     var _a;
     const type = destructure(env.get(operand.identifier.id));
     if ((type === null || type === void 0 ? void 0 : type.kind) === 'Ref' ||
         (type === null || type === void 0 ? void 0 : type.kind) === 'RefValue' ||
         ((type === null || type === void 0 ? void 0 : type.kind) === 'Structure' && ((_a = type.fn) === null || _a === void 0 ? void 0 : _a.readRefEffect))) {
-        errors.push({
+        errors.pushDiagnostic(CompilerDiagnostic.create({
+            severity: ErrorSeverity.InvalidReact,
+            category: 'Cannot access refs during render',
+            description: ERROR_DESCRIPTION,
+        }).withDetail({
+            kind: 'error',
+            loc: (type.kind === 'RefValue' && type.loc) || loc,
+            message: `Passing a ref to a function may read its value during render`,
+        }));
+    }
+}
+function validateNoRefUpdate(errors, env, operand, loc) {
+    const type = destructure(env.get(operand.identifier.id));
+    if ((type === null || type === void 0 ? void 0 : type.kind) === 'Ref' || (type === null || type === void 0 ? void 0 : type.kind) === 'RefValue') {
+        errors.pushDiagnostic(CompilerDiagnostic.create({
             severity: ErrorSeverity.InvalidReact,
-            reason: 'Ref values (the `current` property) may not be accessed during render. (https://react.dev/reference/react/useRef)',
+            category: 'Cannot access refs during render',
+            description: ERROR_DESCRIPTION,
+        }).withDetail({
+            kind: 'error',
             loc: (type.kind === 'RefValue' && type.loc) || loc,
-            description: operand.identifier.name !== null &&
-                operand.identifier.name.kind === 'named'
-                ? `Cannot access ref value \`${operand.identifier.name.value}\``
-                : null,
-            suggestions: null,
-        });
+            message: `Cannot update ref during render`,
+        }));
     }
 }
 function validateNoDirectRefValueAccess(errors, operand, env) {
     var _a;
     const type = destructure(env.get(operand.identifier.id));
     if ((type === null || type === void 0 ? void 0 : type.kind) === 'RefValue') {
-        errors.push({
+        errors.pushDiagnostic(CompilerDiagnostic.create({
             severity: ErrorSeverity.InvalidReact,
-            reason: 'Ref values (the `current` property) may not be accessed during render. (https://react.dev/reference/react/useRef)',
+            category: 'Cannot access refs during render',
+            description: ERROR_DESCRIPTION,
+        }).withDetail({
+            kind: 'error',
             loc: (_a = type.loc) !== null && _a !== void 0 ? _a : operand.loc,
-            description: operand.identifier.name !== null &&
-                operand.identifier.name.kind === 'named'
-                ? `Cannot access ref value \`${operand.identifier.name.value}\``
-                : null,
-            suggestions: null,
-        });
+            message: `Cannot access ref value during render`,
+        }));
     }
 }
+const ERROR_DESCRIPTION = 'React refs are values that are not needed for rendering. Refs should only be accessed ' +
+    'outside of render, such as in event handlers or effects. ' +
+    'Accessing a ref value (the `current` property) during render can cause your component ' +
+    'not to update as expected (https://react.dev/reference/react/useRef)';
 
 function validateNoSetStateInRender(fn) {
     const unconditionalSetStateFunctions = new Set();
@@ -52503,7 +52624,7 @@ const COMPILER_OPTIONS = {
     panicThreshold: 'none',
     flowSuppressions: false,
     environment: validateEnvironmentConfig({
-        validateRefAccessDuringRender: false,
+        validateRefAccessDuringRender: true,
         validateNoSetStateInRender: true,
         validateNoSetStateInEffects: true,
         validateNoJSXInTryStatements: true,
@@ -55572,6 +55693,15 @@ function isInsideDoWhileLoop(node) {
     }
     return false;
 }
+function isInsideTryCatch(node) {
+    while (node) {
+        if (node.type === 'TryStatement' || node.type === 'CatchClause') {
+            return true;
+        }
+        node = node.parent;
+    }
+    return false;
+}
 function isUseEffectEventIdentifier(node) {
     return false;
 }
@@ -55773,6 +55903,12 @@ const rule = {
                         if (hasFlowSuppression(hook, 'react-rule-hook')) {
                             continue;
                         }
+                        if (isUseIdentifier(hook) && isInsideTryCatch(hook)) {
+                            context.report({
+                                node: hook,
+                                message: `React Hook "${getSourceCode().getText(hook)}" cannot be called in a try/catch block.`,
+                            });
+                        }
                         if ((cycled || isInsideDoWhileLoop(hook)) &&
                             !isUseIdentifier(hook)) {
                             context.report({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-react-hooks",
   "description": "ESLint rules for React Hooks",
-  "version": "6.1.0-canary-9be531cd-20250729",
+  "version": "6.1.0-canary-9784cb37-20250730",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",