From 4f5c9d935198bd58e3ae6ad00d4cebbcfc4314d5 Mon Sep 17 00:00:00 2001 From: Dylan Kelly Date: Mon, 11 Nov 2019 13:00:58 +1100 Subject: [PATCH 1/3] Adds placeholder for rplselect field --- .../components/Molecules/Form/fields/fieldRplselect.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/components/Molecules/Form/fields/fieldRplselect.vue b/packages/components/Molecules/Form/fields/fieldRplselect.vue index dfd6929e5..ff9319e7b 100644 --- a/packages/components/Molecules/Form/fields/fieldRplselect.vue +++ b/packages/components/Molecules/Form/fields/fieldRplselect.vue @@ -49,11 +49,8 @@ export default { computed: { config () { return { - multiselect: this.schema.multiselect, - placeholder: 'Select', - showitems: 4, - fieldId: this.getFieldID(this.schema), - label: '' + ...this.schema, + fieldId: this.getFieldID(this.schema) } } } From 60e80ec3189a2ce35d2568cebb920e00a3b927ea Mon Sep 17 00:00:00 2001 From: Dylan Kelly Date: Thu, 7 Nov 2019 16:18:09 +1100 Subject: [PATCH 2/3] fix rpl-select error with no options --- packages/components/Molecules/Form/Select.vue | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/packages/components/Molecules/Form/Select.vue b/packages/components/Molecules/Form/Select.vue index 35d428d5b..aa2f67462 100644 --- a/packages/components/Molecules/Form/Select.vue +++ b/packages/components/Molecules/Form/Select.vue @@ -228,23 +228,25 @@ export default { return false }, focusItem (selected) { - this.focussed = selected - const item = this.$el.querySelector(`#${selected.uuid}`) - const listbox = this.$refs.listbox + if (selected) { + this.focussed = selected + const item = this.$el.querySelector(`#${selected.uuid}`) + const listbox = this.$refs.listbox - if (listbox.scrollHeight > listbox.clientHeight) { - let scrollBottom = listbox.clientHeight + listbox.scrollTop - let elementBottom = item.offsetTop + item.offsetHeight - if (elementBottom > scrollBottom) { - listbox.scrollTop = elementBottom - listbox.clientHeight - } else if (item.offsetTop < listbox.scrollTop) { - listbox.scrollTop = item.offsetTop + if (listbox.scrollHeight > listbox.clientHeight) { + let scrollBottom = listbox.clientHeight + listbox.scrollTop + let elementBottom = item.offsetTop + item.offsetHeight + if (elementBottom > scrollBottom) { + listbox.scrollTop = elementBottom - listbox.clientHeight + } else if (item.offsetTop < listbox.scrollTop) { + listbox.scrollTop = item.offsetTop + } + } + if (item) { + this.$nextTick(function () { + item.focus() + }) } - } - if (item) { - this.$nextTick(function () { - item.focus() - }) } }, handleKeys (e) { From a959ca143f5afeae44ed83343db43275a83dc3aa Mon Sep 17 00:00:00 2001 From: Dylan Kelly Date: Wed, 20 Nov 2019 22:53:36 +1100 Subject: [PATCH 3/3] update snapshots --- src/test/__snapshots__/storyshots.test.js.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/__snapshots__/storyshots.test.js.snap b/src/test/__snapshots__/storyshots.test.js.snap index d607ba5e4..0232c097a 100644 --- a/src/test/__snapshots__/storyshots.test.js.snap +++ b/src/test/__snapshots__/storyshots.test.js.snap @@ -5403,7 +5403,7 @@ exports[`RippleStoryshots Molecules/Form Default 1`] = ` disabled="disabled" value="" > - Select + Select a single topic