From 6fa25b51fec416adf5efc439475adda1e4da2367 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 28 Apr 2025 11:38:55 +0300
Subject: [PATCH] R: Remove unnecessary rerenders from useEffect

---
 .../src/components/input/combo-box.tsx        | 11 ++--
 .../src/components/input/combo-multi.tsx      | 11 ++--
 .../src/components/input/select-tree.tsx      |  7 +--
 .../auth/pages/password-change-page.tsx       | 28 ++++++----
 .../pages/library-page/library-page.tsx       |  2 +-
 .../editor-oss-card/editor-oss-card.tsx       |  6 +--
 .../oss-page/editor-oss-card/form-oss.tsx     | 10 ++--
 .../oss-page/editor-oss-graph/oss-flow.tsx    |  2 +-
 .../oss/pages/oss-page/oss-edit-state.tsx     | 21 ++++----
 .../features/oss/pages/oss-page/oss-page.tsx  |  8 +--
 .../editor-constituenta.tsx                   |  1 -
 .../editor-constituenta/form-constituenta.tsx | 54 +++++++++++++------
 .../editor-rsexpression.tsx                   | 13 ++---
 .../editor-rsform-card/editor-rsform-card.tsx |  5 +-
 .../editor-rsform-card/form-rsform.tsx        | 25 ++++++---
 .../editor-rslist/editor-rslist.tsx           |  2 +-
 .../rsform-page/editor-term-graph/tg-flow.tsx | 14 ++---
 .../rsform/pages/rsform-page/rsedit-state.tsx | 21 ++++----
 .../rsform/pages/rsform-page/rsform-page.tsx  |  8 +--
 .../table-side-constituents.tsx               | 13 +++--
 .../users/pages/register-page/form-signup.tsx |  2 +-
 .../user-profile-page/user-profile-page.tsx   |  2 +-
 .../features/users/stores/use-adjust-role.ts  | 21 ++++++++
 .../src/hooks/use-reset-modification.ts       | 13 +++++
 .../frontend/src/hooks/use-reset-on-change.ts | 10 ++++
 25 files changed, 197 insertions(+), 113 deletions(-)
 create mode 100644 rsconcept/frontend/src/features/users/stores/use-adjust-role.ts
 create mode 100644 rsconcept/frontend/src/hooks/use-reset-modification.ts
 create mode 100644 rsconcept/frontend/src/hooks/use-reset-on-change.ts

diff --git a/rsconcept/frontend/src/components/input/combo-box.tsx b/rsconcept/frontend/src/components/input/combo-box.tsx
index d764ddfc..baeecb38 100644
--- a/rsconcept/frontend/src/components/input/combo-box.tsx
+++ b/rsconcept/frontend/src/components/input/combo-box.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { ChevronDownIcon } from 'lucide-react';
 
 import { IconRemove } from '../icons';
@@ -49,11 +49,12 @@ export function ComboBox<Option>({
   const [popoverWidth, setPopoverWidth] = useState<number | undefined>(undefined);
   const triggerRef = useRef<HTMLButtonElement>(null);
 
-  useEffect(() => {
-    if (triggerRef.current) {
+  function handleOpenChange(isOpen: boolean) {
+    setOpen(isOpen);
+    if (isOpen && triggerRef.current) {
       setPopoverWidth(triggerRef.current.offsetWidth);
     }
-  }, [open]);
+  }
 
   function handleChangeValue(newValue: Option | null) {
     onChange(newValue);
@@ -66,7 +67,7 @@ export function ComboBox<Option>({
   }
 
   return (
-    <Popover open={open} onOpenChange={setOpen}>
+    <Popover open={open} onOpenChange={handleOpenChange}>
       <PopoverTrigger asChild>
         <button
           id={id}
diff --git a/rsconcept/frontend/src/components/input/combo-multi.tsx b/rsconcept/frontend/src/components/input/combo-multi.tsx
index 2883c0b8..65eb5d80 100644
--- a/rsconcept/frontend/src/components/input/combo-multi.tsx
+++ b/rsconcept/frontend/src/components/input/combo-multi.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { ChevronDownIcon } from 'lucide-react';
 
 import { IconRemove } from '../icons';
@@ -43,11 +43,12 @@ export function ComboMulti<Option>({
   const [popoverWidth, setPopoverWidth] = useState<number | undefined>(undefined);
   const triggerRef = useRef<HTMLButtonElement>(null);
 
-  useEffect(() => {
-    if (triggerRef.current) {
+  function handleOpenChange(isOpen: boolean) {
+    setOpen(isOpen);
+    if (isOpen && triggerRef.current) {
       setPopoverWidth(triggerRef.current.offsetWidth);
     }
-  }, [open]);
+  }
 
   function handleAddValue(newValue: Option) {
     if (value.includes(newValue)) {
@@ -70,7 +71,7 @@ export function ComboMulti<Option>({
   }
 
   return (
-    <Popover open={open} onOpenChange={setOpen}>
+    <Popover open={open} onOpenChange={handleOpenChange}>
       <PopoverTrigger asChild>
         <button
           id={id}
diff --git a/rsconcept/frontend/src/components/input/select-tree.tsx b/rsconcept/frontend/src/components/input/select-tree.tsx
index e26a40fd..b8d2e9ac 100644
--- a/rsconcept/frontend/src/components/input/select-tree.tsx
+++ b/rsconcept/frontend/src/components/input/select-tree.tsx
@@ -44,11 +44,12 @@ export function SelectTree<ItemType>({
   ...restProps
 }: SelectTreeProps<ItemType>) {
   const foldable = new Set(items.filter(item => getParent(item) !== item).map(item => getParent(item)));
-  const [folded, setFolded] = useState<ItemType[]>(items);
+  const defaultFolded = items.filter(item => getParent(value) !== item && getParent(getParent(value)) !== item);
+  const [folded, setFolded] = useState<ItemType[]>(defaultFolded);
 
   useEffect(() => {
-    setFolded(items.filter(item => getParent(value) !== item && getParent(getParent(value)) !== item));
-  }, [value, getParent, items]);
+    setFolded(defaultFolded);
+  }, [defaultFolded]);
 
   function onFoldItem(target: ItemType) {
     setFolded(prev =>
diff --git a/rsconcept/frontend/src/features/auth/pages/password-change-page.tsx b/rsconcept/frontend/src/features/auth/pages/password-change-page.tsx
index 453df1f0..dee1f561 100644
--- a/rsconcept/frontend/src/features/auth/pages/password-change-page.tsx
+++ b/rsconcept/frontend/src/features/auth/pages/password-change-page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 
 import { urls, useConceptNavigation } from '@/app';
 
@@ -13,13 +13,26 @@ import { useQueryStrings } from '@/hooks/use-query-strings';
 
 import { useResetPassword } from '../backend/use-reset-password';
 
+function useTokenValidation(token: string, isPending: boolean) {
+  const { validateToken } = useResetPassword();
+  const [isTokenValidating, setIsTokenValidating] = useState(false);
+
+  const validate = async () => {
+    if (!isTokenValidating && !isPending) {
+      await validateToken({ token });
+      setIsTokenValidating(true);
+    }
+  };
+  return { isTokenValidating, validate };
+}
+
 export function Component() {
   const router = useConceptNavigation();
   const token = useQueryStrings().get('token') ?? '';
 
-  const { validateToken, resetPassword, isPending, error: serverError } = useResetPassword();
+  const { resetPassword, isPending, error: serverError } = useResetPassword();
+  const { isTokenValidating, validate } = useTokenValidation(token, isPending);
 
-  const [isTokenValidating, setIsTokenValidating] = useState(false);
   const [newPassword, setNewPassword] = useState('');
   const [newPasswordRepeat, setNewPasswordRepeat] = useState('');
 
@@ -38,12 +51,9 @@ export function Component() {
     }
   }
 
-  useEffect(() => {
-    if (!isTokenValidating && !isPending) {
-      void validateToken({ token: token });
-      setIsTokenValidating(true);
-    }
-  }, [token, validateToken, isTokenValidating, isPending]);
+  if (!isTokenValidating && !isPending) {
+    void validate();
+  }
 
   if (isPending) {
     return <Loader />;
diff --git a/rsconcept/frontend/src/features/library/pages/library-page/library-page.tsx b/rsconcept/frontend/src/features/library/pages/library-page/library-page.tsx
index 8650f690..b5625f02 100644
--- a/rsconcept/frontend/src/features/library/pages/library-page/library-page.tsx
+++ b/rsconcept/frontend/src/features/library/pages/library-page/library-page.tsx
@@ -54,7 +54,7 @@ export function LibraryPage() {
   return (
     <>
       <ToolbarSearch className='top-0 h-9' total={libraryItems.length} filtered={filtered.length} />
-      <div className='relative cc-fade-in flex'>
+      <div className='relative flex'>
         <MiniButton
           title='Выгрузить в формате CSV'
           className='absolute z-tooltip -top-8 right-6 hidden sm:block'
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/editor-oss-card.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/editor-oss-card.tsx
index 1f27a25f..a47f5306 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/editor-oss-card.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/editor-oss-card.tsx
@@ -43,11 +43,7 @@ export function EditorOssCard() {
       />
       <div
         onKeyDown={handleInput}
-        className={clsx(
-          'cc-fade-in',
-          'md:max-w-fit max-w-128 min-w-fit',
-          'flex flex-row flex-wrap pt-8 px-6 justify-center'
-        )}
+        className={clsx('md:max-w-fit max-w-128 min-w-fit', 'flex flex-row flex-wrap pt-8 px-6 justify-center')}
       >
         <div className='cc-column px-3'>
           <FormOSS />
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx
index d7cce097..f3693f0f 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx
@@ -1,7 +1,7 @@
 'use no memo'; // TODO: remove when react hook forms are compliant with react compiler
 'use client';
 
-import { useEffect } from 'react';
+import { useRef } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 
@@ -30,7 +30,7 @@ export function FormOSS() {
     control,
     setValue,
     reset,
-    formState: { isDirty, errors }
+    formState: { errors, isDirty }
   } = useForm<IUpdateLibraryItemDTO>({
     resolver: zodResolver(schemaUpdateLibraryItem),
     defaultValues: {
@@ -46,9 +46,11 @@ export function FormOSS() {
   const visible = useWatch({ control, name: 'visible' });
   const readOnly = useWatch({ control, name: 'read_only' });
 
-  useEffect(() => {
+  const prevDirty = useRef(isDirty);
+  if (prevDirty.current !== isDirty) {
+    prevDirty.current = isDirty;
     setIsModified(isDirty);
-  }, [isDirty, setIsModified]);
+  }
 
   function onSubmit(data: IUpdateLibraryItemDTO) {
     return updateOss(data).then(() => reset({ ...data }));
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx
index 792bfa61..e5cb81df 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx
@@ -411,7 +411,7 @@ export function OssFlow() {
       <ContextMenu isOpen={isContextMenuOpen} onHide={() => setIsContextMenuOpen(false)} {...menuProps} />
 
       <div
-        className={clsx('cc-fade-in relative w-[100vw] cc-mask-sides', !containMovement && 'cursor-relocate')}
+        className={clsx('relative w-[100vw] cc-mask-sides', !containMovement && 'cursor-relocate')}
         style={{ height: mainHeight, fontFamily: 'Rubik' }}
       >
         <ReactFlow
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-state.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-state.tsx
index acfb2b78..75afd3fc 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-state.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-state.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 
 import { urls, useConceptNavigation } from '@/app';
 import { useAuthSuspense } from '@/features/auth';
@@ -8,6 +8,7 @@ import { useLibrarySearchStore } from '@/features/library';
 import { useDeleteItem } from '@/features/library/backend/use-delete-item';
 import { RSTabID } from '@/features/rsform/pages/rsform-page/rsedit-context';
 import { useRoleStore, UserRole } from '@/features/users';
+import { useAdjustRole } from '@/features/users/stores/use-adjust-role';
 
 import { usePreferencesStore } from '@/stores/preferences';
 import { promptText } from '@/utils/labels';
@@ -27,7 +28,6 @@ export const OssEditState = ({ itemID, children }: React.PropsWithChildren<OssEd
   const adminMode = usePreferencesStore(state => state.adminMode);
 
   const role = useRoleStore(state => state.role);
-  const adjustRole = useRoleStore(state => state.adjustRole);
   const setSearchLocation = useLibrarySearchStore(state => state.setLocation);
   const searchLocation = useLibrarySearchStore(state => state.location);
 
@@ -36,21 +36,18 @@ export const OssEditState = ({ itemID, children }: React.PropsWithChildren<OssEd
 
   const isOwned = !!user.id && user.id === schema.owner;
   const isMutable = role > UserRole.READER && !schema.read_only;
+  const isEditor = !!user.id && schema.editors.includes(user.id);
 
   const [selected, setSelected] = useState<number[]>([]);
 
   const { deleteItem } = useDeleteItem();
 
-  useEffect(
-    () =>
-      adjustRole({
-        isOwner: isOwned,
-        isEditor: !!user.id && schema.editors.includes(user.id),
-        isStaff: user.is_staff,
-        adminMode: adminMode
-      }),
-    [schema, adjustRole, isOwned, user, adminMode]
-  );
+  useAdjustRole({
+    isOwner: isOwned,
+    isEditor: isEditor,
+    isStaff: user.is_staff,
+    adminMode: adminMode
+  });
 
   function navigateTab(tab: OssTabID) {
     const url = urls.oss_props({
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-page.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-page.tsx
index ef0478b9..87a47cfa 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-page.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-page.tsx
@@ -1,6 +1,5 @@
 'use client';
 
-import { useEffect } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 import { useParams } from 'react-router';
 import { z } from 'zod';
@@ -12,6 +11,7 @@ import { isAxiosError } from '@/backend/api-transport';
 import { TextURL } from '@/components/control';
 import { type ErrorData } from '@/components/info-error';
 import { useQueryStrings } from '@/hooks/use-query-strings';
+import { useResetModification } from '@/hooks/use-reset-modification';
 import { useModificationStore } from '@/stores/modification';
 
 import { OperationTooltip } from '../../components/tooltip-oss-item';
@@ -26,6 +26,8 @@ const paramsSchema = z.strictObject({
 });
 
 export function OssPage() {
+  useResetModification();
+
   const router = useConceptNavigation();
   const params = useParams();
   const query = useQueryStrings();
@@ -35,11 +37,9 @@ export function OssPage() {
     tab: query.get('tab')
   });
 
-  const { isModified, setIsModified } = useModificationStore();
+  const { isModified } = useModificationStore();
   useBlockNavigation(isModified);
 
-  useEffect(() => setIsModified(false), [setIsModified]);
-
   if (!urlData.id) {
     router.replace({ path: urls.page404, force: true });
     return null;
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/editor-constituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/editor-constituenta.tsx
index 8781545e..d075b735 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/editor-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/editor-constituenta.tsx
@@ -75,7 +75,6 @@ export function EditorConstituenta() {
       tabIndex={-1}
       className={clsx(
         'relative ',
-        'cc-fade-in',
         'min-h-80 max-w-[calc(min(100vw,80rem))] mx-auto',
         'flex pt-8',
         'overflow-y-auto overflow-x-clip',
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx
index a9dfdc69..a7fc4a47 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx
@@ -1,7 +1,7 @@
 'use no memo'; // TODO: remove when react hook forms are compliant with react compiler
 'use client';
 
-import { useEffect, useLayoutEffect, useMemo, useState } from 'react';
+import { useMemo, useRef, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { toast } from 'react-toastify';
 import { zodResolver } from '@hookform/resolvers/zod';
@@ -44,19 +44,30 @@ export function FormConstituenta({ disabled, id, toggleReset, schema, activeCst,
   const { isModified, setIsModified } = useModificationStore();
   const isProcessing = useMutatingRSForm();
 
+  const { updateConstituenta: cstUpdate } = useUpdateConstituenta();
+  const showTypification = useDialogsStore(state => state.showShowTypeGraph);
+  const showEditTerm = useDialogsStore(state => state.showEditWordForms);
+  const showRenameCst = useDialogsStore(state => state.showRenameCst);
+
   const {
     register,
     handleSubmit,
     control,
     reset,
     formState: { isDirty }
-  } = useForm<IUpdateConstituentaDTO>({ resolver: zodResolver(schemaUpdateConstituenta) });
-
-  const { updateConstituenta: cstUpdate } = useUpdateConstituenta();
-  const showTypification = useDialogsStore(state => state.showShowTypeGraph);
-  const showEditTerm = useDialogsStore(state => state.showEditWordForms);
-  const showRenameCst = useDialogsStore(state => state.showRenameCst);
-
+  } = useForm<IUpdateConstituentaDTO>({
+    resolver: zodResolver(schemaUpdateConstituenta),
+    defaultValues: {
+      target: activeCst.id,
+      item_data: {
+        convention: activeCst.convention,
+        term_raw: activeCst.term_raw,
+        definition_raw: activeCst.definition_raw,
+        definition_formal: activeCst.definition_formal
+      }
+    }
+  });
+  const [forceComment, setForceComment] = useState(false);
   const [localParse, setLocalParse] = useState<IExpressionParseDTO | null>(null);
 
   const typification = useMemo(
@@ -80,12 +91,21 @@ export function FormConstituenta({ disabled, id, toggleReset, schema, activeCst,
     [activeCst, localParse]
   );
 
-  const [forceComment, setForceComment] = useState(false);
   const isBasic = isBasicConcept(activeCst.cst_type);
   const isElementary = isBaseSet(activeCst.cst_type);
   const showConvention = !!activeCst.convention || forceComment || isBasic;
 
-  useEffect(() => {
+  const prevActiveCstID = useRef(activeCst.id);
+  const prevToggleReset = useRef(toggleReset);
+  const prevSchema = useRef(schema);
+  if (
+    prevActiveCstID.current !== activeCst.id ||
+    prevToggleReset.current !== toggleReset ||
+    prevSchema.current !== schema
+  ) {
+    prevActiveCstID.current = activeCst.id;
+    prevToggleReset.current = toggleReset;
+    prevSchema.current = schema;
     reset({
       target: activeCst.id,
       item_data: {
@@ -97,15 +117,19 @@ export function FormConstituenta({ disabled, id, toggleReset, schema, activeCst,
     });
     setForceComment(false);
     setLocalParse(null);
-  }, [activeCst, schema, toggleReset, reset]);
+  }
 
-  useLayoutEffect(() => {
+  const prevDirty = useRef(isDirty);
+  if (prevDirty.current !== isDirty) {
+    prevDirty.current = isDirty;
     setIsModified(isDirty);
-    return () => setIsModified(false);
-  }, [isDirty, activeCst, setIsModified]);
+  }
 
   function onSubmit(data: IUpdateConstituentaDTO) {
-    return cstUpdate({ itemID: schema.id, data }).then(() => reset({ ...data }));
+    return cstUpdate({ itemID: schema.id, data }).then(() => {
+      setIsModified(false);
+      reset({ ...data });
+    });
   }
 
   function handleTypeGraph(event: React.MouseEvent<Element>) {
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/editor-rsexpression.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/editor-rsexpression.tsx
index c06981f5..e0881619 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/editor-rsexpression.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsexpression/editor-rsexpression.tsx
@@ -1,9 +1,10 @@
 'use client';
 
-import { useEffect, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { toast } from 'react-toastify';
 import { type ReactCodeMirrorRef } from '@uiw/react-codemirror';
 
+import { useResetOnChange } from '@/hooks/use-reset-on-change';
 import { useDialogsStore } from '@/stores/dialogs';
 import { usePreferencesStore } from '@/stores/preferences';
 import { errorMsg } from '@/utils/labels';
@@ -69,6 +70,11 @@ export function EditorRSExpression({
 
   const { checkConstituenta: checkInternal, isPending } = useCheckConstituenta();
 
+  useResetOnChange([activeCst, toggleReset], () => {
+    setIsModified(false);
+    setParseData(null);
+  });
+
   function checkConstituenta(
     expression: string,
     activeCst: IConstituenta,
@@ -85,11 +91,6 @@ export function EditorRSExpression({
     });
   }
 
-  useEffect(() => {
-    setIsModified(false);
-    setParseData(null);
-  }, [activeCst, toggleReset]);
-
   function handleChange(newValue: string) {
     onChange(newValue);
     setIsModified(newValue !== activeCst.definition_formal);
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/editor-rsform-card.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/editor-rsform-card.tsx
index 2f2f7f2d..b88cbab5 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/editor-rsform-card.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/editor-rsform-card.tsx
@@ -31,10 +31,7 @@ export function EditorRSFormCard() {
   }
 
   return (
-    <div
-      onKeyDown={handleInput}
-      className='relative cc-fade-in md:w-fit md:max-w-fit max-w-128 flex flex-row flex-wrap px-6 pt-8'
-    >
+    <div onKeyDown={handleInput} className='relative md:w-fit md:max-w-fit max-w-128 flex flex-row flex-wrap px-6 pt-8'>
       <ToolbarItemCard
         className='cc-tab-tools'
         onSubmit={initiateSubmit}
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx
index 4740d5c3..7d93d79b 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx
@@ -1,7 +1,7 @@
 'use no memo'; // TODO: remove when react hook forms are compliant with react compiler
 'use client';
 
-import { useEffect } from 'react';
+import { useRef } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 
@@ -41,12 +41,23 @@ export function FormRSForm() {
     reset,
     formState: { isDirty, errors }
   } = useForm<IUpdateLibraryItemDTO>({
-    resolver: zodResolver(schemaUpdateLibraryItem)
+    resolver: zodResolver(schemaUpdateLibraryItem),
+    defaultValues: {
+      id: schema.id,
+      item_type: LibraryItemType.RSFORM,
+      title: schema.title,
+      alias: schema.alias,
+      description: schema.description,
+      visible: schema.visible,
+      read_only: schema.read_only
+    }
   });
   const visible = useWatch({ control, name: 'visible' });
   const readOnly = useWatch({ control, name: 'read_only' });
 
-  useEffect(() => {
+  const prevSchema = useRef(schema);
+  if (prevSchema.current !== schema) {
+    prevSchema.current = schema;
     reset({
       id: schema.id,
       item_type: LibraryItemType.RSFORM,
@@ -56,11 +67,13 @@ export function FormRSForm() {
       visible: schema.visible,
       read_only: schema.read_only
     });
-  }, [schema, reset]);
+  }
 
-  useEffect(() => {
+  const prevDirty = useRef(isDirty);
+  if (prevDirty.current !== isDirty) {
+    prevDirty.current = isDirty;
     setIsModified(isDirty);
-  }, [isDirty, setIsModified]);
+  }
 
   function handleSelectVersion(version: CurrentVersion) {
     router.push({ path: urls.schema(schema.id, version === 'latest' ? undefined : version) });
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/editor-rslist.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/editor-rslist.tsx
index d7799960..c1f8d467 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/editor-rslist.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rslist/editor-rslist.tsx
@@ -126,7 +126,7 @@ export function EditorRSList() {
   const tableHeight = useFitHeight('4rem + 5px');
 
   return (
-    <div tabIndex={-1} onKeyDown={handleKeyDown} className='relative cc-fade-in pt-8'>
+    <div tabIndex={-1} onKeyDown={handleKeyDown} className='relative pt-8'>
       {isContentEditable ? (
         <ToolbarRSList className='cc-tab-tools right-4 md:right-1/2 -translate-x-1/2 md:translate-x-0 cc-animate-position' />
       ) : null}
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/tg-flow.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/tg-flow.tsx
index 6240a707..17a2a83b 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/tg-flow.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/tg-flow.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import {
   type Edge,
   MarkerType,
@@ -121,17 +121,19 @@ export function TGFlow() {
     }, PARAMETER.minimalTimeout);
   }, [schema, filteredGraph, setNodes, setEdges, filter.noText, fitView, viewportInitialized, focusCst]);
 
-  useEffect(() => {
-    if (!viewportInitialized) {
-      return;
-    }
+  const prevSelected = useRef<number[]>([]);
+  if (
+    viewportInitialized &&
+    (prevSelected.current.length !== selected.length || prevSelected.current.some((id, i) => id !== selected[i]))
+  ) {
+    prevSelected.current = selected;
     setNodes(prev =>
       prev.map(node => ({
         ...node,
         selected: selected.includes(Number(node.id))
       }))
     );
-  }, [selected, setNodes, viewportInitialized]);
+  }
 
   function handleSetSelected(newSelection: number[]) {
     setSelected(newSelection);
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsedit-state.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsedit-state.tsx
index 504bc32d..c79adabb 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsedit-state.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsedit-state.tsx
@@ -1,12 +1,13 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 
 import { urls, useConceptNavigation } from '@/app';
 import { useAuthSuspense } from '@/features/auth';
 import { useLibrarySearchStore } from '@/features/library';
 import { useDeleteItem } from '@/features/library/backend/use-delete-item';
 import { useRoleStore, UserRole } from '@/features/users';
+import { useAdjustRole } from '@/features/users/stores/use-adjust-role';
 
 import { useDialogsStore } from '@/stores/dialogs';
 import { useModificationStore } from '@/stores/modification';
@@ -39,7 +40,6 @@ export const RSEditState = ({
   const router = useConceptNavigation();
   const adminMode = usePreferencesStore(state => state.adminMode);
   const role = useRoleStore(state => state.role);
-  const adjustRole = useRoleStore(state => state.adjustRole);
   const setSearchLocation = useLibrarySearchStore(state => state.setLocation);
   const searchLocation = useLibrarySearchStore(state => state.location);
 
@@ -52,6 +52,7 @@ export const RSEditState = ({
   const isMutable = role > UserRole.READER && !schema.read_only;
   const isContentEditable = isMutable && !isArchive;
   const isAttachedToOSS = schema.oss.length > 0;
+  const isEditor = !!user.id && schema.editors.includes(user.id);
 
   const [selected, setSelected] = useState<number[]>([]);
   const canDeleteSelected = selected.length > 0 && selected.every(id => !schema.cstByID.get(id)?.is_inherited);
@@ -67,16 +68,12 @@ export const RSEditState = ({
   const showDeleteCst = useDialogsStore(state => state.showDeleteCst);
   const showCstTemplate = useDialogsStore(state => state.showCstTemplate);
 
-  useEffect(
-    () =>
-      adjustRole({
-        isOwner: isOwned,
-        isEditor: !!user.id && schema.editors.includes(user.id),
-        isStaff: user.is_staff,
-        adminMode: adminMode
-      }),
-    [schema, adjustRole, isOwned, user, adminMode]
-  );
+  useAdjustRole({
+    isOwner: isOwned,
+    isEditor: isEditor,
+    isStaff: user.is_staff,
+    adminMode: adminMode
+  });
 
   function handleSetFocus(newValue: IConstituenta | null) {
     setFocusCst(newValue);
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsform-page.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsform-page.tsx
index cadd98b8..6c6ee8e3 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsform-page.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/rsform-page.tsx
@@ -1,6 +1,5 @@
 'use client';
 
-import { useEffect } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 import { useParams } from 'react-router';
 import { z } from 'zod';
@@ -12,6 +11,7 @@ import { Divider } from '@/components/container';
 import { TextURL } from '@/components/control';
 import { type ErrorData } from '@/components/info-error';
 import { useQueryStrings } from '@/hooks/use-query-strings';
+import { useResetModification } from '@/hooks/use-reset-modification';
 import { useModificationStore } from '@/stores/modification';
 
 import { ConstituentaTooltip } from '../../components/constituenta-tooltip';
@@ -34,6 +34,8 @@ const paramsSchema = z.strictObject({
 });
 
 export function RSFormPage() {
+  useResetModification();
+
   const router = useConceptNavigation();
   const params = useParams();
   const query = useQueryStrings();
@@ -45,11 +47,9 @@ export function RSFormPage() {
     activeID: query.get('active')
   });
 
-  const { isModified, setIsModified } = useModificationStore();
+  const { isModified } = useModificationStore();
   useBlockNavigation(isModified);
 
-  useEffect(() => setIsModified(false), [setIsModified]);
-
   if (!urlData.id) {
     router.replace({ path: urls.page404, force: true });
     return null;
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/table-side-constituents.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/table-side-constituents.tsx
index b0d31163..ed539115 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/table-side-constituents.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/view-constituents/table-side-constituents.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect } from 'react';
+import { useRef } from 'react';
 
 import { createColumnHelper, DataTable, type IConditionalStyle } from '@/components/data-table';
 import { NoData, TextContent } from '@/components/view';
@@ -26,11 +26,10 @@ export function TableSideConstituents({ autoScroll = true, maxHeight }: TableSid
   const { activeCst, navigateCst } = useRSEdit();
   const items = useFilteredItems();
 
-  useEffect(() => {
-    if (!activeCst) {
-      return;
-    }
-    if (autoScroll) {
+  const prevActiveCstID = useRef<number | null>(null);
+  if (autoScroll && prevActiveCstID.current !== activeCst?.id) {
+    prevActiveCstID.current = activeCst?.id ?? null;
+    if (!!activeCst) {
       setTimeout(() => {
         const element = document.getElementById(`${prefixes.cst_side_table}${activeCst.id}`);
         if (element) {
@@ -42,7 +41,7 @@ export function TableSideConstituents({ autoScroll = true, maxHeight }: TableSid
         }
       }, PARAMETER.refreshTimeout);
     }
-  }, [activeCst, autoScroll]);
+  }
 
   const columns = [
     columnHelper.accessor('alias', {
diff --git a/rsconcept/frontend/src/features/users/pages/register-page/form-signup.tsx b/rsconcept/frontend/src/features/users/pages/register-page/form-signup.tsx
index 21051b1f..42cbfbe2 100644
--- a/rsconcept/frontend/src/features/users/pages/register-page/form-signup.tsx
+++ b/rsconcept/frontend/src/features/users/pages/register-page/form-signup.tsx
@@ -55,7 +55,7 @@ export function FormSignup() {
 
   return (
     <form
-      className='cc-column cc-fade-in mx-auto w-144 px-6 py-3'
+      className='cc-column mx-auto w-144 px-6 py-3'
       onSubmit={event => void handleSubmit(onSubmit)(event)}
       onChange={resetErrors}
     >
diff --git a/rsconcept/frontend/src/features/users/pages/user-profile-page/user-profile-page.tsx b/rsconcept/frontend/src/features/users/pages/user-profile-page/user-profile-page.tsx
index 7f6327ee..d72c9389 100644
--- a/rsconcept/frontend/src/features/users/pages/user-profile-page/user-profile-page.tsx
+++ b/rsconcept/frontend/src/features/users/pages/user-profile-page/user-profile-page.tsx
@@ -6,7 +6,7 @@ import { EditorProfile } from './editor-profile';
 export function UserProfilePage() {
   return (
     <RequireAuth>
-      <div className='cc-fade-in flex flex-col py-2 mx-auto w-fit'>
+      <div className='flex flex-col py-2 mx-auto w-fit'>
         <h1 className='mb-2 select-none'>Учетные данные пользователя</h1>
         <div className='flex py-2'>
           <EditorProfile />
diff --git a/rsconcept/frontend/src/features/users/stores/use-adjust-role.ts b/rsconcept/frontend/src/features/users/stores/use-adjust-role.ts
new file mode 100644
index 00000000..82c402e2
--- /dev/null
+++ b/rsconcept/frontend/src/features/users/stores/use-adjust-role.ts
@@ -0,0 +1,21 @@
+import { useRef } from 'react';
+
+import { useRoleStore } from './role';
+
+interface AdjustRoleProps {
+  isOwner: boolean;
+  isEditor: boolean;
+  isStaff: boolean;
+  adminMode: boolean;
+}
+
+export function useAdjustRole(input: AdjustRoleProps) {
+  const adjustRole = useRoleStore(state => state.adjustRole);
+  const lastInput = useRef<string | null>(null);
+
+  const serializedInput = JSON.stringify(input);
+  if (lastInput.current !== serializedInput) {
+    lastInput.current = serializedInput;
+    adjustRole(input);
+  }
+}
diff --git a/rsconcept/frontend/src/hooks/use-reset-modification.ts b/rsconcept/frontend/src/hooks/use-reset-modification.ts
new file mode 100644
index 00000000..1246ce48
--- /dev/null
+++ b/rsconcept/frontend/src/hooks/use-reset-modification.ts
@@ -0,0 +1,13 @@
+import { useRef } from 'react';
+
+import { useModificationStore } from '@/stores/modification';
+
+export function useResetModification() {
+  const { setIsModified } = useModificationStore();
+  const initialized = useRef(false);
+
+  if (!initialized.current) {
+    initialized.current = true;
+    setIsModified(false);
+  }
+}
diff --git a/rsconcept/frontend/src/hooks/use-reset-on-change.ts b/rsconcept/frontend/src/hooks/use-reset-on-change.ts
new file mode 100644
index 00000000..c2bda2d5
--- /dev/null
+++ b/rsconcept/frontend/src/hooks/use-reset-on-change.ts
@@ -0,0 +1,10 @@
+import { useRef } from 'react';
+
+export function useResetOnChange<T>(deps: T[], resetFn: () => void) {
+  const lastDeps = useRef<string | null>(null);
+  const currentDeps = JSON.stringify(deps);
+  if (lastDeps.current !== currentDeps) {
+    lastDeps.current = currentDeps;
+    resetFn();
+  }
+}