fix(VSlider): render label slot

fixes #18251
vuetifyjs · Sep 14, 2023 · eb07336 · eb07336
1 parent f314cd1
commit eb07336
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 17 deletions.
diff --git a/eslint-local-rules.js b/eslint-local-rules.js
@@ -8,4 +8,5 @@ module.exports = {
   'jest-global-imports': require('./scripts/rules/jest-global-imports'),
   'cypress-types-reference': require('./scripts/rules/cypress-types-reference'),
   'sort-imports': require('./scripts/rules/sort-imports'),
+  'no-nullish-coalescing-in-condition': require('./scripts/rules/no-nullish-coalescing-in-condition'),
 }
diff --git a/packages/vuetify/.eslintrc.js b/packages/vuetify/.eslintrc.js
@@ -17,6 +17,7 @@ module.exports = {
     // 'vue/html-closing-bracket-spacing': 'off',
     // 'local-rules/no-render-string-reference': 'error',
     'local-rules/no-components-index': 'error',
+    'local-rules/no-nullish-coalescing-in-condition': 'error',
 
     'no-restricted-imports': ['error', {
       paths: [{

diff --git a/packages/vuetify/src/components/VRangeSlider/VRangeSlider.tsx b/packages/vuetify/src/components/VRangeSlider/VRangeSlider.tsx
@@ -151,14 +151,15 @@ export const VRangeSlider = genericComponent<VSliderSlots>()({
             ...slots,
             prepend: hasPrepend ? slotProps => (
               <>
-                { slots.label?.(slotProps) ?? props.label
-                  ? (
-                    <VLabel
-                      class="v-slider__label"
-                      text={ props.label }
-                    />
-                  ) : undefined
-                }
+                { slots.label?.(slotProps) ?? (
+                  props.label
+                    ? (
+                      <VLabel
+                        class="v-slider__label"
+                        text={ props.label }
+                      />
+                    ) : undefined
+                )}
 
                 { slots.prepend?.(slotProps) }
               </>

diff --git a/packages/vuetify/src/components/VSlider/VSlider.tsx b/packages/vuetify/src/components/VSlider/VSlider.tsx
@@ -118,15 +118,16 @@ export const VSlider = genericComponent<VSliderSlots>()({
             ...slots,
             prepend: hasPrepend ? slotProps => (
               <>
-                { slots.label?.(slotProps) ?? props.label
-                  ? (
-                    <VLabel
-                      id={ slotProps.id.value }
-                      class="v-slider__label"
-                      text={ props.label }
-                    />
-                  ) : undefined
-                }
+                { slots.label?.(slotProps) ?? (
+                  props.label
+                    ? (
+                      <VLabel
+                        id={ slotProps.id.value }
+                        class="v-slider__label"
+                        text={ props.label }
+                      />
+                    ) : undefined
+                )}
 
                 { slots.prepend?.(slotProps) }
               </>

diff --git a/scripts/rules/no-nullish-coalescing-in-condition.js b/scripts/rules/no-nullish-coalescing-in-condition.js
@@ -0,0 +1,29 @@
+module.exports = {
+  create (context) {
+    const sourceCode = context.getSourceCode()
+
+    function isParenthesised (node) {
+      const previousToken = sourceCode.getTokenBefore(node)
+      const nextToken = sourceCode.getTokenAfter(node)
+
+      return Boolean(previousToken && nextToken) &&
+        previousToken.value === '(' && previousToken.range[1] <= node.range[0] &&
+        nextToken.value === ')' && nextToken.range[0] >= node.range[1]
+    }
+
+    return {
+      ConditionalExpression (node) {
+        if (
+          node.test.type === 'LogicalExpression' &&
+          node.test.operator === '??' &&
+          !isParenthesised(node.test)
+        ) {
+          context.report({
+            node: node.test,
+            message: 'Do not use nullish coalescing in ternary conditions',
+          })
+        }
+      },
+    }
+  },
+}