Переглянути джерело

Merge pull request #6382 from weseek/fix/101155-uncontrolled-err-related-to-customize-sidebar-settings

resolve  uncontrolled input err on browser
cao 3 роки тому
батько
коміт
7cae9f039c

+ 1 - 3
packages/app/src/components/Admin/Customize/Customize.jsx

@@ -51,9 +51,7 @@ function Customize(props) {
         <CustomizeThemeSetting />
         <CustomizeThemeSetting />
       </div>
       </div>
       <div className="mb-5">
       <div className="mb-5">
-        {/* TODO: [resolve browser err] A component is changing an uncontrolled input to be controlled. by https://redmine.weseek.co.jp/issues/101155
-          <CustomizeSidebarSetting />
-        */}
+        <CustomizeSidebarSetting />
       </div>
       </div>
       <div className="mb-5">
       <div className="mb-5">
         <CustomizeFunctionSetting />
         <CustomizeFunctionSetting />

+ 2 - 2
packages/app/src/components/Admin/Customize/CustomizeSidebarSetting.tsx

@@ -78,7 +78,7 @@ const CustomizeSidebarsetting = (): JSX.Element => {
                 id="is-open"
                 id="is-open"
                 className="custom-control-input"
                 className="custom-control-input"
                 name="mailVisibility"
                 name="mailVisibility"
-                checked={!isSidebarDrawerMode && !isSidebarClosedAtDockMode}
+                checked={isSidebarDrawerMode === false && isSidebarClosedAtDockMode === false}
                 disabled={isSidebarDrawerMode}
                 disabled={isSidebarDrawerMode}
                 onChange={() => setIsSidebarClosedAtDockMode(false)}
                 onChange={() => setIsSidebarClosedAtDockMode(false)}
               />
               />
@@ -92,7 +92,7 @@ const CustomizeSidebarsetting = (): JSX.Element => {
                 id="is-closed"
                 id="is-closed"
                 className="custom-control-input"
                 className="custom-control-input"
                 name="mailVisibility"
                 name="mailVisibility"
-                checked={!isSidebarDrawerMode && isSidebarClosedAtDockMode}
+                checked={isSidebarDrawerMode === false && isSidebarClosedAtDockMode === true}
                 disabled={isSidebarDrawerMode}
                 disabled={isSidebarDrawerMode}
                 onChange={() => setIsSidebarClosedAtDockMode(true)}
                 onChange={() => setIsSidebarClosedAtDockMode(true)}
               />
               />