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.

Sign up for GitHub

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

Jump to bottom

Vue3 #157

Merged
merged 6 commits into from
May 6, 2022
Merged

Vue3 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73c6147
continue bar vue3 updates
May 4, 2022
8bcfe51
content modal vue3 updates
May 4, 2022
409064f
currency input vue-3 updates
May 4, 2022
c15a703
Merge branch 'v2' of github.com:bcgov/common-lib-vue into v2
May 6, 2022
8106812
Merge branch 'vue3' of github.com:bcgov/common-lib-vue into vue3
May 6, 2022
282e762
run linting rules
May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 48 additions & 19 deletions src/components/ContentModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,44 @@
<template>
<div class="modal fade show"
<div
ref="modal"
class="modal fade show"
tabindex="-1"
aria-labelledby="modal-title"
aria-modal="true"
role="dialog"
ref="modal"
@click="handleClickBackground()">
<div :class="`modal-dialog ${!!size ? 'modal-' + size : ''}`"
@click="stopPropagation($event)">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title"
id="modal-title">{{title}}</h5>
<button v-if="isCloseButtonShown"
@click="handleClickBackground()"
>
<div
:class="`modal-dialog ${!!size ? 'modal-' + size : ''}`"
@click="stopPropagation($event)"
>
<div
class="modal-content"
>
<div
class="modal-header"
>
<h5
id="modal-title"
class="modal-title"
>
{{ title }}
</h5>
<button
v-if="isCloseButtonShown"
type="button"
class="close"
aria-label="Close"
@click="handleClose()">
<span aria-hidden="true">&times;</span>
@click="handleClose()"
>
<span
aria-hidden="true"
>&times;</span>
</button>
</div>
<div class="modal-body">
<div
class="modal-body"
>
<slot>Content Here</slot>
</div>
</div>
Expand All @@ -33,7 +51,9 @@ import cypressMixin from "../mixins/cypress-mixin.js"

export default {
name: "ContentModal",
mixins: [ cypressMixin ],
mixins: [
cypressMixin,
],
props: {
title: {
type: String,
Expand All @@ -43,8 +63,13 @@ export default {
type: String,
default: '',
validator: (value) => {
return ['', 'sm', 'lg', 'xl'].includes(value);
}
return [
'',
'sm',
'lg',
'xl',
].includes(value);
},
},
className: {
type: String,
Expand All @@ -57,11 +82,15 @@ export default {
closeOnBackgroundClick: {
type: Boolean,
default: true,
}
},
},
emits: [
'close',
],
data: () => {
return {
focusableEls: [],
focusableEls: [
],
focusedEl: null,
contentObserver: null,
};
Expand All @@ -80,7 +109,7 @@ export default {
const observerConfig = {
attributes: true,
childList: true,
subtree: true
subtree: true,
};
this.contentObserver = new MutationObserver(this.handleContentChange);
this.contentObserver.observe(this.$refs.modal, observerConfig);
Expand Down
60 changes: 37 additions & 23 deletions src/components/ContinueBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
<template>
<div :class='componentClass'>
<div class="d-flex flex-wrap justify-content-end p-3 container">
<Button v-if="hasSecondaryButton"
:className="'secondary-button'"
:color="'gold'"
:label='secondaryButtonLabel'
:data-cy="getCypressValue()"
@click='onSecondaryClick()'/>
<Button :label='buttonLabel'
:hasLoader='hasLoader'
:data-cy="getCypressValue()"
@click='onContinue()'/>
<div
:class="componentClass"
>
<div
class="d-flex flex-wrap justify-content-end p-3 container"
>
<Button
v-if="hasSecondaryButton"
:class-name="'secondary-button'"
:color="'gold'"
:label="secondaryButtonLabel"
:data-cy="getCypressValue()"
@click="onSecondaryClick()"
/>
<Button
:label="buttonLabel"
:has-loader="hasLoader"
:data-cy="getCypressValue()"
@click="onContinue()"
/>
</div>
</div>
</template>
Expand All @@ -22,21 +30,23 @@ import cypressMixin from "../mixins/cypress-mixin.js"
export default {
name: 'ContinueBar',
components: {
Button
Button,
},
mixins: [ cypressMixin ],
mixins: [
cypressMixin,
],
props: {
hasLoader: {
type: Boolean,
default: false
default: false,
},
hasSecondaryButton: {
type: Boolean,
default: false
default: false,
},
buttonLabel: {
type: String,
default: 'Continue'
default: 'Continue',
},
secondaryButtonLabel: {
type: String,
Expand All @@ -46,19 +56,23 @@ export default {
default: true,
},
},
emits: [
'continue',
'secondary',
],
computed: {
componentClass() {
return `continue-bar ${this.isSticky ? 'sticky' : ''}`;
},
},
methods: {
onContinue() {
this.$emit('continue');
},
onSecondaryClick() {
this.$emit('secondary');
}
},
},
computed: {
componentClass() {
return `continue-bar ${this.isSticky ? 'sticky' : ''}`;
}
}
};
</script>

Expand Down
Loading