Revert "feat: Ignore top level indent (#498)"

MadCcc · MadCcc · commit 2c4e96a79799 · 2022-08-04T11:34:06.000+08:00
This reverts commit fa7e350.
diff --git a/src/hooks/useDirectionStyle.ts b/src/hooks/useDirectionStyle.ts
@@ -8,7 +8,7 @@ export default function useDirectionStyle(level: number): React.CSSProperties {
     return null;
   }
 
-  const len = Math.max(0, level - 1);
+  const len = level;
   return rtl
     ? { paddingRight: len * inlineIndent }
     : { paddingLeft: len * inlineIndent };
diff --git a/tests/__snapshots__/Keyboard.spec.tsx.snap b/tests/__snapshots__/Keyboard.spec.tsx.snap
@@ -19,7 +19,7 @@ HTMLCollection [
         class="rc-menu-submenu-title"
         data-menu-id="rc-menu-uuid-test-light"
         role="menuitem"
-        style="padding-left: 0px;"
+        style="padding-left: 24px;"
         tabindex="-1"
         title="Light"
       >
@@ -37,7 +37,7 @@ HTMLCollection [
           class="rc-menu-item"
           data-menu-id="rc-menu-uuid-test-bamboo"
           role="menuitem"
-          style="padding-left: 24px;"
+          style="padding-left: 48px;"
           tabindex="-1"
         >
           Bamboo
diff --git a/tests/__snapshots__/Menu.spec.js.snap b/tests/__snapshots__/Menu.spec.js.snap
@@ -282,7 +282,7 @@ HTMLCollection [
           class="rc-menu-item"
           data-menu-id="rc-menu-uuid-test-1"
           role="menuitem"
-          style="padding-left: 0px;"
+          style="padding-left: 24px;"
           tabindex="-1"
         >
           1
@@ -294,7 +294,7 @@ HTMLCollection [
           class="rc-menu-item"
           data-menu-id="rc-menu-uuid-test-2"
           role="menuitem"
-          style="padding-left: 0px;"
+          style="padding-left: 24px;"
           tabindex="-1"
         >
           2
@@ -305,7 +305,7 @@ HTMLCollection [
       class="rc-menu-item"
       data-menu-id="rc-menu-uuid-test-3"
       role="menuitem"
-      style="padding-left: 0px;"
+      style="padding-left: 24px;"
       tabindex="-1"
     >
       3
@@ -326,7 +326,7 @@ HTMLCollection [
           class="rc-menu-item"
           data-menu-id="rc-menu-uuid-test-4"
           role="menuitem"
-          style="padding-left: 0px;"
+          style="padding-left: 24px;"
           tabindex="-1"
         >
           4
@@ -336,7 +336,7 @@ HTMLCollection [
           class="rc-menu-item rc-menu-item-disabled"
           data-menu-id="rc-menu-uuid-test-5"
           role="menuitem"
-          style="padding-left: 0px;"
+          style="padding-left: 24px;"
         >
           5
         </li>
@@ -353,7 +353,7 @@ HTMLCollection [
         class="rc-menu-submenu-title"
         data-menu-id="rc-menu-uuid-test-tmp_key-3"
         role="menuitem"
-        style="padding-left: 0px;"
+        style="padding-left: 24px;"
         tabindex="-1"
         title="submenu"
       >
@@ -396,7 +396,7 @@ HTMLCollection [
           class="rc-menu-item"
           data-menu-id="rc-menu-uuid-test-1"
           role="menuitem"
-          style="padding-right: 0px;"
+          style="padding-right: 24px;"
           tabindex="-1"
         >
           1
@@ -408,7 +408,7 @@ HTMLCollection [
           class="rc-menu-item"
           data-menu-id="rc-menu-uuid-test-2"
           role="menuitem"
-          style="padding-right: 0px;"
+          style="padding-right: 24px;"
           tabindex="-1"
         >
           2
@@ -419,7 +419,7 @@ HTMLCollection [
       class="rc-menu-item"
       data-menu-id="rc-menu-uuid-test-3"
       role="menuitem"
-      style="padding-right: 0px;"
+      style="padding-right: 24px;"
       tabindex="-1"
     >
       3
@@ -440,7 +440,7 @@ HTMLCollection [
           class="rc-menu-item"
           data-menu-id="rc-menu-uuid-test-4"
           role="menuitem"
-          style="padding-right: 0px;"
+          style="padding-right: 24px;"
           tabindex="-1"
         >
           4
@@ -450,7 +450,7 @@ HTMLCollection [
           class="rc-menu-item rc-menu-item-disabled"
           data-menu-id="rc-menu-uuid-test-5"
           role="menuitem"
-          style="padding-right: 0px;"
+          style="padding-right: 24px;"
         >
           5
         </li>
@@ -467,7 +467,7 @@ HTMLCollection [
         class="rc-menu-submenu-title"
         data-menu-id="rc-menu-uuid-test-tmp_key-3"
         role="menuitem"
-        style="padding-right: 0px;"
+        style="padding-right: 24px;"
         tabindex="-1"
         title="submenu"
       >
diff --git a/tests/__snapshots__/MenuItem.spec.js.snap b/tests/__snapshots__/MenuItem.spec.js.snap
@@ -58,7 +58,7 @@ HTMLCollection [
       data-menu-id="rc-menu-uuid-test-1"
       data-whatever="whatever"
       role="menuitem"
-      style="padding-left: 0px; font-size: 20px;"
+      style="padding-left: 24px; font-size: 20px;"
       tabindex="-1"
       title="title"
     >
@@ -77,7 +77,7 @@ HTMLCollection [
         class="rc-menu-submenu-title"
         data-menu-id="rc-menu-uuid-test-bamboo"
         role="menuitem"
-        style="padding-left: 0px;"
+        style="padding-left: 24px;"
         tabindex="-1"
         title="title"
       >
@@ -96,7 +96,7 @@ HTMLCollection [
           data-menu-id="rc-menu-uuid-test-2"
           data-whatever="whatever"
           role="menuitem"
-          style="padding-left: 24px; font-size: 20px;"
+          style="padding-left: 48px; font-size: 20px;"
           tabindex="-1"
           title="title"
         >
@@ -123,7 +123,7 @@ HTMLCollection [
           data-menu-id="rc-menu-uuid-test-3"
           data-whatever="whatever"
           role="menuitem"
-          style="padding-left: 0px; font-size: 20px;"
+          style="padding-left: 24px; font-size: 20px;"
           tabindex="-1"
           title="title"
         >
diff --git a/tests/__snapshots__/Options.spec.tsx.snap b/tests/__snapshots__/Options.spec.tsx.snap
@@ -19,7 +19,7 @@ HTMLCollection [
         class="rc-menu-submenu-title"
         data-menu-id="rc-menu-uuid-test-sub1"
         role="menuitem"
-        style="padding-left: 0px;"
+        style="padding-left: 24px;"
         tabindex="-1"
         title="SubMenu"
       >
@@ -49,7 +49,7 @@ HTMLCollection [
               class="rc-menu-item"
               data-menu-id="rc-menu-uuid-test-1"
               role="menuitem"
-              style="padding-left: 24px;"
+              style="padding-left: 48px;"
               tabindex="-1"
             >
               Menu Item 1
@@ -58,7 +58,7 @@ HTMLCollection [
               class="rc-menu-item"
               data-menu-id="rc-menu-uuid-test-2"
               role="menuitem"
-              style="padding-left: 24px;"
+              style="padding-left: 48px;"
               tabindex="-1"
             >
               Menu Item 2

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export default function useDirectionStyle(level: number): React.CSSProperties {`
`8`	`8`	`return null;`
`9`	`9`	`}`
`10`	`10`
`11`		`- const len = Math.max(0, level - 1);`
	`11`	`+ const len = level;`
`12`	`12`	`return rtl`
`13`	`13`	`? { paddingRight: len * inlineIndent }`
`14`	`14`	`: { paddingLeft: len * inlineIndent };`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ HTMLCollection [`
`282`	`282`	`class="rc-menu-item"`
`283`	`283`	`data-menu-id="rc-menu-uuid-test-1"`
`284`	`284`	`role="menuitem"`
`285`		`- style="padding-left: 0px;"`
	`285`	`+ style="padding-left: 24px;"`
`286`	`286`	`tabindex="-1"`
`287`	`287`	`>`
`288`	`288`	`1`
`@@ -294,7 +294,7 @@ HTMLCollection [`
`294`	`294`	`class="rc-menu-item"`
`295`	`295`	`data-menu-id="rc-menu-uuid-test-2"`
`296`	`296`	`role="menuitem"`
`297`		`- style="padding-left: 0px;"`
	`297`	`+ style="padding-left: 24px;"`
`298`	`298`	`tabindex="-1"`
`299`	`299`	`>`
`300`	`300`	`2`
`@@ -305,7 +305,7 @@ HTMLCollection [`
`305`	`305`	`class="rc-menu-item"`
`306`	`306`	`data-menu-id="rc-menu-uuid-test-3"`
`307`	`307`	`role="menuitem"`
`308`		`- style="padding-left: 0px;"`
	`308`	`+ style="padding-left: 24px;"`
`309`	`309`	`tabindex="-1"`
`310`	`310`	`>`
`311`	`311`	`3`
`@@ -326,7 +326,7 @@ HTMLCollection [`
`326`	`326`	`class="rc-menu-item"`
`327`	`327`	`data-menu-id="rc-menu-uuid-test-4"`
`328`	`328`	`role="menuitem"`
`329`		`- style="padding-left: 0px;"`
	`329`	`+ style="padding-left: 24px;"`
`330`	`330`	`tabindex="-1"`
`331`	`331`	`>`
`332`	`332`	`4`
`@@ -336,7 +336,7 @@ HTMLCollection [`
`336`	`336`	`class="rc-menu-item rc-menu-item-disabled"`
`337`	`337`	`data-menu-id="rc-menu-uuid-test-5"`
`338`	`338`	`role="menuitem"`
`339`		`- style="padding-left: 0px;"`
	`339`	`+ style="padding-left: 24px;"`
`340`	`340`	`>`
`341`	`341`	`5`
`342`	`342`	`</li>`
`@@ -353,7 +353,7 @@ HTMLCollection [`
`353`	`353`	`class="rc-menu-submenu-title"`
`354`	`354`	`data-menu-id="rc-menu-uuid-test-tmp_key-3"`
`355`	`355`	`role="menuitem"`
`356`		`- style="padding-left: 0px;"`
	`356`	`+ style="padding-left: 24px;"`
`357`	`357`	`tabindex="-1"`
`358`	`358`	`title="submenu"`
`359`	`359`	`>`
`@@ -396,7 +396,7 @@ HTMLCollection [`
`396`	`396`	`class="rc-menu-item"`
`397`	`397`	`data-menu-id="rc-menu-uuid-test-1"`
`398`	`398`	`role="menuitem"`
`399`		`- style="padding-right: 0px;"`
	`399`	`+ style="padding-right: 24px;"`
`400`	`400`	`tabindex="-1"`
`401`	`401`	`>`
`402`	`402`	`1`
`@@ -408,7 +408,7 @@ HTMLCollection [`
`408`	`408`	`class="rc-menu-item"`
`409`	`409`	`data-menu-id="rc-menu-uuid-test-2"`
`410`	`410`	`role="menuitem"`
`411`		`- style="padding-right: 0px;"`
	`411`	`+ style="padding-right: 24px;"`
`412`	`412`	`tabindex="-1"`
`413`	`413`	`>`
`414`	`414`	`2`
`@@ -419,7 +419,7 @@ HTMLCollection [`
`419`	`419`	`class="rc-menu-item"`
`420`	`420`	`data-menu-id="rc-menu-uuid-test-3"`
`421`	`421`	`role="menuitem"`
`422`		`- style="padding-right: 0px;"`
	`422`	`+ style="padding-right: 24px;"`
`423`	`423`	`tabindex="-1"`
`424`	`424`	`>`
`425`	`425`	`3`
`@@ -440,7 +440,7 @@ HTMLCollection [`
`440`	`440`	`class="rc-menu-item"`
`441`	`441`	`data-menu-id="rc-menu-uuid-test-4"`
`442`	`442`	`role="menuitem"`
`443`		`- style="padding-right: 0px;"`
	`443`	`+ style="padding-right: 24px;"`
`444`	`444`	`tabindex="-1"`
`445`	`445`	`>`
`446`	`446`	`4`
`@@ -450,7 +450,7 @@ HTMLCollection [`
`450`	`450`	`class="rc-menu-item rc-menu-item-disabled"`
`451`	`451`	`data-menu-id="rc-menu-uuid-test-5"`
`452`	`452`	`role="menuitem"`
`453`		`- style="padding-right: 0px;"`
	`453`	`+ style="padding-right: 24px;"`
`454`	`454`	`>`
`455`	`455`	`5`
`456`	`456`	`</li>`
`@@ -467,7 +467,7 @@ HTMLCollection [`
`467`	`467`	`class="rc-menu-submenu-title"`
`468`	`468`	`data-menu-id="rc-menu-uuid-test-tmp_key-3"`
`469`	`469`	`role="menuitem"`
`470`		`- style="padding-right: 0px;"`
	`470`	`+ style="padding-right: 24px;"`
`471`	`471`	`tabindex="-1"`
`472`	`472`	`title="submenu"`
`473`	`473`	`>`