Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): use correct list type for QSliderSlots (fix: #17060) #17061

Merged
merged 2 commits into from
Jun 5, 2024

Conversation

thexeos
Copy link
Contributor

@thexeos thexeos commented Mar 30, 2024

What kind of change does this PR introduce?

  • Bugfix

Does this PR introduce a breaking change?

  • No

The PR fulfills these requirements:

  • It's submitted to the dev branch (or v[X] branch)
  • When resolving a specific issue, it's referenced in the PR's title (e.g. fix: #xxx[,#xxx], where "xxx" is the issue number)

This fixes #17060

This comment has been minimized.

Copy link
Member

@yusufkandemir yusufkandemir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing! I also removed the type itself as it's not needed anymore.

@yusufkandemir yusufkandemir merged commit fe421fb into quasarframework:dev Jun 5, 2024
1 check passed
Copy link

github-actions bot commented Jun 5, 2024

Build Results

JSON API

📜 Changes detected:

diff --git a/./current-build/api/QRange.json b/./pr-build/api/QRange.json
index ff50db4..5067ca5 100644
--- a/./current-build/api/QRange.json
+++ b/./pr-build/api/QRange.json
@@ -556,7 +556,7 @@
         },
         "markerList": {
           "type": "Array",
-          "tsType": "SliderMarkerLabelArrayConfig",
+          "tsType": "SliderMarkerLabelConfig",
           "desc": "Array of marker label configs",
           "definition": {
             "index": {
@@ -655,7 +655,7 @@
       "scope": {
         "markerList": {
           "type": "Array",
-          "tsType": "SliderMarkerLabelArrayConfig",
+          "tsType": "SliderMarkerLabelConfig",
           "desc": "Array of marker label configs",
           "definition": {
             "index": {
diff --git a/./current-build/api/QSlider.json b/./pr-build/api/QSlider.json
index 54302d0..b8530e1 100644
--- a/./current-build/api/QSlider.json
+++ b/./pr-build/api/QSlider.json
@@ -451,7 +451,7 @@
         },
         "markerList": {
           "type": "Array",
-          "tsType": "SliderMarkerLabelArrayConfig",
+          "tsType": "SliderMarkerLabelConfig",
           "desc": "Array of marker label configs",
           "definition": {
             "index": {
@@ -550,7 +550,7 @@
       "scope": {
         "markerList": {
           "type": "Array",
-          "tsType": "SliderMarkerLabelArrayConfig",
+          "tsType": "SliderMarkerLabelConfig",
           "desc": "Array of marker label configs",
           "definition": {
             "index": {

Types

📜 Changes detected:

diff --git a/./current-build/types/api/slider.d.ts b/./pr-build/types/api/slider.d.ts
index be31a06..0c1c530 100644
--- a/./current-build/types/api/slider.d.ts
+++ b/./pr-build/types/api/slider.d.ts
@@ -40,8 +40,6 @@ export type SliderMarkerLabelConfig = {
   style: VueStyleObjectProp;
 };
 
-export type SliderMarkerLabelArrayConfig = SliderMarkerLabelConfig[];
-
 export interface SliderMarkerLabelObjectConfig {
   [value: number]: SliderMarkerLabelConfig;
 }
diff --git a/./current-build/types/index.d.ts b/./pr-build/types/index.d.ts
index a084b57..89bd1ab 100644
--- a/./current-build/types/index.d.ts
+++ b/./pr-build/types/index.d.ts
@@ -10078,7 +10078,7 @@ export interface QRangeSlots {
     /**
      * Array of marker label configs
      */
-    markerList: SliderMarkerLabelArrayConfig[];
+    markerList: SliderMarkerLabelConfig[];
     /**
      * Object with key-value where key is the model and the value is the marker label config
      */
@@ -10102,7 +10102,7 @@ export interface QRangeSlots {
     /**
      * Array of marker label configs
      */
-    markerList: SliderMarkerLabelArrayConfig[];
+    markerList: SliderMarkerLabelConfig[];
     /**
      * Object with key-value where key is the model and the value is the marker label config
      */
@@ -11764,7 +11764,7 @@ export interface QSliderSlots {
     /**
      * Array of marker label configs
      */
-    markerList: SliderMarkerLabelArrayConfig[];
+    markerList: SliderMarkerLabelConfig[];
     /**
      * Object with key-value where key is the model and the value is the marker label config
      */
@@ -11788,7 +11788,7 @@ export interface QSliderSlots {
     /**
      * Array of marker label configs
      */
-    markerList: SliderMarkerLabelArrayConfig[];
+    markerList: SliderMarkerLabelConfig[];
     /**
      * Object with key-value where key is the model and the value is the marker label config
      */
@@ -16504,7 +16504,6 @@ import { QInputNativeElement } from "./api";
 import { QPopupProxyInnerComponent } from "./api";
 import { SliderMarkerLabels } from "./api";
 import { SliderMarkerLabelConfig } from "./api";
-import { SliderMarkerLabelArrayConfig } from "./api";
 import { SliderMarkerLabelObjectConfig } from "./api";
 import { QTreeNode } from "./api";
 import { QUploaderFactoryFn } from "./api";

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect TS type for markerList of QSliderSlots
2 participants