Skip to content

Commit

Permalink
Merge pull request #265 from marceloatg/develop
Browse files Browse the repository at this point in the history
Test ID data parameter added to some components
  • Loading branch information
marceloatg authored May 5, 2024
2 parents 19a1276 + a353d1c commit 568b5e5
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 85 deletions.
150 changes: 75 additions & 75 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"exports": {
".": {
"import": "./dist/vuetning.es.js",
"require": "./dist/vuetning.umd.js"
"require": "./dist/vuetning.umd.js",
"types": "./dist/main.d.ts"
},
"./style.css": "./dist/style.css"
},
Expand All @@ -32,7 +33,7 @@
"numeral": "^2.0.6",
"scrollparent": "^2.1.0",
"uuid": "^9.0.1",
"vue": "^3.4.23",
"vue": "^3.4.26",
"vue-observe-visibility": "^2.0.0-alpha.1"
},
"devDependencies": {
Expand All @@ -47,10 +48,10 @@
"npm-run-all2": "^6.1.2",
"postcss": "^8.4.38",
"postcss-prefix-selector": "^1.16.1",
"sass": "^1.75.0",
"sass": "^1.76.0",
"typescript": "~5.4.0",
"vite": "^5.2.10",
"vitepress": "^1.1.3",
"vite": "^5.2.11",
"vitepress": "^1.1.4",
"vue-tsc": "^2.0.13"
}
}
4 changes: 2 additions & 2 deletions src/components/slds-button/slds-button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<!-- Spinner -->
<span v-if="showSpinner">
<span class="slds-spinner slds-spinner_x-small" :class="spinnerClassNames">
<span :class="spinnerClassNames" data-testid="spinner">
<span class="slds-spinner__dot-a"/>
<span class="slds-spinner__dot-b"/>
</span>
Expand Down Expand Up @@ -185,7 +185,7 @@ export default defineComponent({
* The CSS class names for the spinner.
*/
spinnerClassNames(): string {
let classNames = ""
let classNames = "slds-spinner slds-spinner_x-small"
// Spinner theme
if (this.showSpinner && (this.brand || this.destructive || this.success)) classNames += " slds-spinner-white"
Expand Down
1 change: 1 addition & 0 deletions src/components/slds-combobox/slds-combobox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
:filter="filter"
:focused-option="focusedOption"
:is-open="isOpen"
:length="length"
:options="filteredOptions"
:selected-option="selectedOption"
:show-spinner="showSpinner"
Expand Down
6 changes: 3 additions & 3 deletions src/components/slds-form-element/slds-form-element.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
</div>

<!-- Inline help -->
<div v-if="hasInlineHelp" class="slds-form-element__help">
<div v-if="hasInlineHelp" class="slds-form-element__help" data-testid="help">
<slot name="help">
{{ help }}
</slot>
</div>

<!-- Error messages -->
<div v-if="hasErrorMessages" class="slds-form-element__help">
<div v-if="hasErrorMessages" class="slds-form-element__help" data-testid="errors">
<slot name="error">
<p v-for="error of errors" :key="error.$uid">
<p v-for="error of errors" :key="error.$uid" data-testid="error">
{{ error.$message }}
</p>
</slot>
Expand Down
1 change: 1 addition & 0 deletions src/components/slds-picklist/slds-picklist.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<slds-dropdown
:focused-option="focusedOption"
:is-open="isOpen"
:length="length"
:options="options"
:selected-option="selectedOption"
:show-spinner="showSpinner"
Expand Down

0 comments on commit 568b5e5

Please sign in to comment.