@farm-investimentos/front-mfe-components 15.7.3 → 15.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@farm-investimentos/front-mfe-components",
-	"version": "15.7.3",
+	"version": "15.8.1",
 	"author": "farm investimentos",
 	"private": false,
 	"main": "./dist/front-mfe-components.common.js",

package/src/components/Select/Select.stories.js

@@ -288,6 +288,42 @@ export const Multiple = () => ({
 	</div>`,
 });
 
+export const MultipleWithAllOption = () => ({
+	data() {
+		return {
+			v: null,
+			items: [
+				{ value: 0, text: 'value 0' },
+				{ value: 1, text: 'value 1' },
+				{ value: 2, text: 'value 2' },
+				{ value: 3, text: 'value 3' },
+			],
+		};
+	},
+	template: `<div style="width: 400px">
+		<farm-select v-model="v" :items="items" multiple has-all-option />
+		v-model: {{ v }}
+	</div>`,
+});
+
+export const MultipleWithAllOptionAndDisabledItems = () => ({
+	data() {
+		return {
+			v: null,
+			items: [
+				{ value: 0, text: 'value 0' },
+				{ value: 1, text: 'value 1', disabled: true },
+				{ value: 2, text: 'value 2' },
+				{ value: 3, text: 'value 3', disabled: true },
+			],
+		};
+	},
+	template: `<div style="width: 400px">
+		<farm-select v-model="v" :items="items" multiple has-all-option />
+		v-model: {{ v }}
+	</div>`,
+});
+
 export const MultipleInitValue = () => ({
 	data() {
 		return {

package/src/components/Select/Select.vue

@@ -1,5 +1,7 @@
 <template>
 	<div
+		v-if="!readonly && !disabled"
+		:id="customId"
 		:class="{
 			'farm-textfield': true,
 			'farm-textfield--validatable': rules.length > 0,
@@ -10,8 +12,6 @@
 			'farm-textfield--focused': isFocus || isVisible,
 			'farm-textfield--hiddendetails': hideDetails,
 		}"
-		v-if="!readonly && !disabled"
-		:id="customId"
 	>
 		<farm-contextmenu
 			bottom
@@ -20,13 +20,34 @@
 			ref="contextmenu"
 		>
 			<farm-list v-if="!readonly" ref="listRef" @keydown="onKeyDown">
+				<farm-listitem
+					v-if="hasAllOption"
+					tabindex="0"
+					clickable
+					hover-color-variation="lighten"
+					:hover-color="hasAllDisabled ? 'neutral' : 'primary'"
+					:class="{
+						'farm-listitem--selected': innerValue === 'all',
+						'farm-listitem--disabled': hasAllDisabled,
+					}"
+					@click="selectAll"
+				>
+					<farm-checkbox
+						v-model="hasAllSelected"
+						class="farm-select__checkbox"
+						value="all"
+						size="sm"
+						:disabled="hasAllDisabled"
+					/>
+					<farm-caption bold tag="span">Todos</farm-caption>
+				</farm-listitem>
 				<farm-listitem
 					v-for="(item, index) in items"
 					tabindex="0"
 					clickable
 					hover-color-variation="lighten"
-					:hover-color="item.disabled ? 'neutral' : 'primary'"
 					:key="'contextmenu_item_' + index"
+					:hover-color="item.disabled ? 'neutral' : 'primary'"
 					:class="{
 						'farm-listitem--selected': item[itemValue] === innerValue,
 						'farm-listitem--disabled': item.disabled,
@@ -34,20 +55,20 @@
 					@click="selectItem(item)"
 				>
 					<farm-checkbox
-						class="farm-select__checkbox"
+						v-if="isChecked(item)"
 						v-model="checked"
+						class="farm-select__checkbox"
 						value="1"
 						size="sm"
 						:disabled="item.disabled"
-						v-if="isChecked(item)"
 					/>
 					<farm-checkbox
-						class="farm-select__checkbox"
+						v-else-if="multiple"
 						v-model="checked"
+						class="farm-select__checkbox"
 						value="2"
 						size="sm"
 						:disabled="item.disabled"
-						v-else-if="multiple"
 					/>
 					<farm-caption bold tag="span">{{ item[itemText] }}</farm-caption>
 				</farm-listitem>
@@ -55,7 +76,7 @@
 					{{ noDataText }}
 				</farm-listitem>
 			</farm-list>
-			<template v-slot:activator="{}">
+			<template #activator="{}">
 				<div
 					class="farm-textfield--input farm-textfield--input--iconed"
 					@keydown="onKeyDown"
@@ -198,6 +219,13 @@ export default defineComponent({
 			type: String,
 			default: '',
 		},
+		/**
+		 * Set "All" as first option to select all other values<br />
+		 */
+		hasAllOption: {
+			type: Boolean,
+			default: false,
+		},
 		/**
 		 * The updated bound model<br />
 		 * _event_
@@ -262,9 +290,32 @@ export default defineComponent({
 		let fieldValidator = validateFormFieldBuilder(rules.value);
 		let validate = validateFormMethodBuilder(errorBucket, valid, fieldValidator);
 
+		const enabledItems = computed(() => items.value.filter(item => !item.disabled));
+		const disabledItems = computed(() => items.value.filter(item => item.disabled));
 		const hasError = computed(() => {
 			return errorBucket.value.length > 0;
 		});
+		const hasAllSelected = computed({
+			get() {
+				if (
+					!multiple.value ||
+					!Array.isArray(items.value) ||
+					!Array.isArray(innerValue.value)
+				) {
+					return false;
+				}
+
+				if (innerValue.value.length === enabledItems.value.length) {
+					return 'all';
+				}
+
+				return false;
+			},
+			set() {
+				emit('input', innerValue.value);
+			},
+		});
+		const hasAllDisabled = computed(() => items.value.length == disabledItems.value.length);
 
 		const customId = 'farm-select-' + (props.id || randomId(2));
 
@@ -282,6 +333,7 @@ export default defineComponent({
 				) {
 					multipleValues.value = [];
 				}
+
 				if (Array.isArray(newValue) && newValue.length > 0) {
 					multipleValues.value = [...newValue];
 				}
@@ -386,6 +438,21 @@ export default defineComponent({
 				emit('change', innerValue.value);
 			}, 100);
 		};
+		const selectAll = () => {
+			if (hasAllDisabled.value) {
+				return;
+			}
+
+			if (multipleValues.value.length === enabledItems.value.length) {
+				multipleValues.value = [];
+			} else {
+				multipleValues.value = enabledItems.value.map(item => item[itemValue.value]);
+			}
+
+			checked.value = '1';
+			innerValue.value = [...multipleValues.value];
+			validate(innerValue.value);
+		};
 
 		const clickInput = () => {
 			isTouched.value = true;
@@ -474,6 +541,8 @@ export default defineComponent({
 			valid,
 			validatable,
 			hasError,
+			hasAllSelected,
+			hasAllDisabled,
 			isTouched,
 			isBlured,
 			isFocus,
@@ -485,6 +554,7 @@ export default defineComponent({
 			validate,
 			reset,
 			selectItem,
+			selectAll,
 			onBlur,
 			onFocus,
 			clickInput,

package/src/components/Select/__tests__/Select.spec.js

@@ -1,17 +1,16 @@
 import { shallowMount } from '@vue/test-utils';
 import Select from '../Select';
 
-/* jest.spyOn(global, 'setTimeout').mockImplementation(fn => {
-	fn();
-	return setTimeout(() => 1, 0);
-}); */
-
 describe('Select component', () => {
 	let wrapper;
 	let component;
 
 	beforeEach(() => {
-		wrapper = shallowMount(Select);
+		wrapper = shallowMount(Select, {
+			propsData: {
+				id: 'my-custom-id',
+			},
+		});
 		component = wrapper.vm;
 	});
 
@@ -145,21 +144,15 @@ describe('Select component', () => {
 
 				expect(component.innerValue).toBe(1);
 				expect(component.selectedText).toBe('value 1');
+
 				component.selectItem(items[2]);
-				setTimeout(() => {
-					expect(component.innerValue).toBe(2);
-					expect(component.selectedText).toBe('value 2');
-				}, 150);
+				expect(component.innerValue).toBe(2);
+
 				component.selectItem(items[0]);
-				setTimeout(() => {
-					expect(component.innerValue).toBe(2);
-					expect(component.selectedText).toBe('value 2');
-				}, 150);
+				expect(component.innerValue).toBe(2);
+
 				component.selectItem(items[3]);
-				setTimeout(() => {
-					expect(component.innerValue).toBe(3);
-					expect(component.selectedText).toBe('value 3');
-				}, 150);
+				expect(component.innerValue).toBe(3);
 			});
 			it('should not select a disabled item if is multiple', async () => {
 				const items = [
@@ -177,16 +170,67 @@ describe('Select component', () => {
 
 				expect(component.innerValue).toEqual([0]);
 				expect(component.selectedText).toBe('value 0');
+
 				component.selectItem(items[2]);
-				setTimeout(() => {
-					expect(component.innerValue).toEqual([0, 2]);
-					expect(component.selectedText).toBe('value 0 (+1 outro)');
-				}, 150);
+				expect(component.innerValue).toEqual([0, 2]);
+
 				component.selectItem(items[1]);
-				setTimeout(() => {
-					expect(component.innerValue).toEqual([0, 2]);
-					expect(component.selectedText).toBe('value 0 (+1 outro)');
-				}, 150);
+				expect(component.innerValue).toEqual([0, 2]);
+
+				component.selectItem(items[0]);
+				expect(component.innerValue).toEqual([2]);
+
+				component.selectItem(items[0]);
+				expect(component.innerValue).toEqual([2, 0]);
+			});
+		});
+
+		describe('multiple with all option', () => {
+			it('should check all options', async () => {
+				const items = [
+					{ value: 0, text: 'value 0' },
+					{ value: 1, text: 'value 1' },
+					{ value: 2, text: 'value 2' },
+					{ value: 3, text: 'value 3' },
+				];
+
+				await wrapper.setProps({
+					items,
+					value: null,
+					multiple: true,
+				});
+
+				expect(component.hasAllSelected).toBe(false);
+				expect(component.multipleValues).toEqual([]);
+
+				component.selectAll();
+
+				expect(component.hasAllSelected).toBe('all');
+				expect(component.multipleValues).toEqual(items.map(item => item.value));
+			});
+			it('should check all options but disabled', async () => {
+				const items = [
+					{ value: 0, text: 'value 0' },
+					{ value: 1, text: 'value 1', disabled: true },
+					{ value: 2, text: 'value 2' },
+					{ value: 3, text: 'value 3', disabled: true },
+				];
+
+				await wrapper.setProps({
+					items,
+					value: null,
+					multiple: true,
+				});
+
+				expect(component.hasAllSelected).toBe(false);
+				expect(component.multipleValues).toEqual([]);
+
+				component.selectAll();
+
+				expect(component.hasAllSelected).toBe('all');
+				expect(component.multipleValues).toEqual(
+					items.filter(item => !item.disabled).map(item => item.value)
+				);
 			});
 		});
 

package/src/components/SelectAutoComplete/SelectAutoComplete.scss

@@ -28,22 +28,30 @@
 	margin-right: 8px;
 }
 
-:deep(.farm-listitem:hover .farm-typography) {
+:deep(.farm-listitem:focus .farm-typography) {
 	color: var(--farm-primary-base);
 }
 
-:deep(.farm-listitem:focus .farm-typography) {
+:deep(.farm-listitem:focus .farm-checkbox .farm-icon) {
+	color: var(--farm-primary-lighten);
+}
+
+:deep(.farm-listitem:not(.farm-listitem--disabled):hover .farm-typography) {
 	color: var(--farm-primary-base);
 }
 
-:deep(.farm-listitem:hover .farm-checkbox .farm-icon) {
+:deep(.farm-listitem:not(.farm-listitem--disabled):focus .farm-typography) {
+	color: var(--farm-primary-base);
+}
+
+:deep(.farm-listitem:not(.farm-listitem--disabled):hover .farm-checkbox .farm-icon) {
 	color: var(--farm-primary-lighten);
 }
 
-:deep(.farm-listitem:focus .farm-checkbox .farm-icon) {
+:deep(.farm-listitem:not(.farm-listitem--disabled):focus .farm-checkbox .farm-icon) {
 	color: var(--farm-primary-lighten);
 }
 
 :deep(.farm-listitem:hover .farm-checkbox.farm-checkbox--checked .farm-icon) {
 	color: white;
-}
+}

package/src/components/SelectAutoComplete/SelectAutoComplete.stories.js

@@ -326,3 +326,39 @@ export const ChangeEvent = () => ({
 
 	</div>`,
 });
+
+export const MultipleWithAllOption = () => ({
+	data() {
+		return {
+			v: null,
+			items: [
+				{ value: 0, text: 'value 0' },
+				{ value: 1, text: 'value 1' },
+				{ value: 2, text: 'value 2' },
+				{ value: 3, text: 'value 3' },
+			],
+		};
+	},
+	template: `<div style="width: 400px">
+		<farm-select-auto-complete v-model="v" :items="items" multiple has-all-option />
+		v-model: {{ v }}
+	</div>`,
+});
+
+export const MultipleWithAllOptionAndDisabledItems = () => ({
+	data() {
+		return {
+			v: null,
+			items: [
+				{ value: 0, text: 'value 0' },
+				{ value: 1, text: 'value 1', disabled: true },
+				{ value: 2, text: 'value 2' },
+				{ value: 3, text: 'value 3', disabled: true },
+			],
+		};
+	},
+	template: `<div style="width: 400px">
+		<farm-select-auto-complete v-model="v" :items="items" multiple has-all-option />
+		v-model: {{ v }}
+	</div>`,
+});

package/src/components/SelectAutoComplete/SelectAutoComplete.vue

@@ -14,16 +14,45 @@
 			v-if="!readonly && !disabled"
 			:id="customId"
 		>
-			<farm-contextmenu bottom v-model="isVisible" :stay-open="multiple" ref="contextmenu">
+			<farm-contextmenu
+				bottom
+				v-model="isVisible"
+				:stay-open="multiple || clickedDisabledItem"
+				ref="contextmenu"
+			>
 				<farm-list v-if="!readonly" ref="listRef" @keyup="onKeyUp">
+					<farm-listitem
+						v-if="hasAllOption"
+						tabindex="0"
+						clickable
+						hover-color-variation="lighten"
+						:hover-color="hasAllDisabled ? 'neutral' : 'primary'"
+						:class="{
+							'farm-listitem--selected': innerValue === 'all',
+							'farm-listitem--disabled': hasAllDisabled,
+						}"
+						@click="selectAll"
+					>
+						<farm-checkbox
+							v-model="hasAllSelected"
+							class="farm-select__checkbox"
+							value="all"
+							size="sm"
+							:disabled="hasAllDisabled"
+						/>
+						<farm-caption bold tag="span">Todos</farm-caption>
+					</farm-listitem>
 					<farm-listitem
 						tabindex="0"
 						v-for="(item, index) in showFilteredItems ? filteredItems : items"
 						clickable
 						hoverColorVariation="lighten"
-						hover-color="primary"
+						:hover-color="item.disabled ? 'neutral' : 'primary'"
 						:key="'contextmenu_item_' + index"
-						:class="{ 'farm-listitem--selected': item[itemValue] === innerValue }"
+						:class="{
+							'farm-listitem--selected': item[itemValue] === innerValue,
+							'farm-listitem--disabled': item.disabled,
+						}"
 						@click="selectItem(item)"
 					>
 						<farm-checkbox
@@ -32,6 +61,7 @@
 							value="1"
 							size="sm"
 							v-if="isChecked(item)"
+							:disabled="item.disabled"
 						/>
 						<farm-checkbox
 							class="farm-select__checkbox"
@@ -39,6 +69,7 @@
 							value="2"
 							size="sm"
 							v-else-if="multiple"
+							:disabled="item.disabled"
 						/>
 						<farm-caption bold tag="span">{{ item[itemText] }}</farm-caption>
 					</farm-listitem>
@@ -161,7 +192,7 @@ export default defineComponent({
 		 * This can be changed using the item-text ad item-value
 		 */
 		items: {
-			type: Array,
+			type: Array as PropType<Array<Function>>,
 			default: () => [],
 		},
 		/**
@@ -242,6 +273,13 @@ export default defineComponent({
 			// eslint-disable-next-line
 			default: (event: Event) => {},
 		},
+		/**
+		 * Set "All" as first option to select all other values<br />
+		 */
+		hasAllOption: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	setup(props, { emit }) {
 		const { rules, items, itemText, itemValue, disabled, multiple } = toRefs(props);
@@ -269,6 +307,9 @@ export default defineComponent({
 		let fieldValidator = validateFormFieldBuilder(rules.value);
 		let validate = validateFormMethodBuilder(errorBucket, valid, fieldValidator);
 
+		const enabledItems = computed(() => items.value.filter(item => !item.disabled));
+		const disabledItems = computed(() => items.value.filter(item => item.disabled));
+
 		const hasError = computed(() => {
 			return errorBucket.value.length > 0;
 		});
@@ -279,6 +320,43 @@ export default defineComponent({
 
 		const searchText = ref('');
 
+		const hasAllDisabled = computed(() => items.value.length == disabledItems.value.length);
+
+		const clickedDisabledItem = ref(false);
+
+		const hasAllSelected = computed({
+			get() {
+				if (
+					!multiple.value ||
+					!Array.isArray(items.value) ||
+					!Array.isArray(innerValue.value)
+				) {
+					return false;
+				}
+				if (innerValue.value.length === enabledItems.value.length) {
+					return 'all';
+				}
+				return false;
+			},
+			set() {
+				emit('input', innerValue.value);
+			},
+		});
+
+		const selectAll = () => {
+			if (hasAllDisabled.value) {
+				return;
+			}
+			if (multipleValues.value.length === enabledItems.value.length) {
+				multipleValues.value = [];
+			} else {
+				multipleValues.value = enabledItems.value.map(item => item[itemValue.value]);
+			}
+			checked.value = '1';
+			innerValue.value = [...multipleValues.value];
+			validate(innerValue.value);
+		};
+
 		const filterOptions = () => {
 			searchText.value = selectedText.value.toLowerCase();
 			if (!searchText || searchText.value.includes('+')) {
@@ -408,6 +486,20 @@ export default defineComponent({
 		};
 
 		const selectItem = item => {
+			if (inputField.value) {
+				inputField.value.focus();
+			}
+
+			if (item.disabled) {
+				clickedDisabledItem.value = true;
+
+				// "Schedule" execution to next loop, so the contextMenu won't close immediately if a disabled item is clicked
+				setTimeout(() => {
+					clickedDisabledItem.value = false;
+				});
+				return;
+			}
+
 			if (multiple.value) {
 				const alreadyAdded = multipleValues.value.findIndex(
 					val => val === item[itemValue.value]
@@ -531,6 +623,7 @@ export default defineComponent({
 			isChecked,
 			multipleValues,
 			addLabelToMultiple,
+			clickedDisabledItem,
 			inputField,
 			onKeyUp,
 			addFocusToInput,
@@ -541,6 +634,9 @@ export default defineComponent({
 			showFilteredItems,
 			searchText,
 			handleOutsideClick,
+			hasAllDisabled,
+			hasAllSelected,
+			selectAll,
 		};
 	},
 });