@bethinkpl/design-system 41.1.4 → 42.0.0

package/lib/js/components/Drawer/DrawerHeader/DrawerHeader.vue

@@ -1,65 +1,76 @@
 <template>
-	<div class="ds-drawerHeader">
-		<div class="ds-drawerHeader__titleWrapper">
-			<ds-button
-				v-if="isSecondLevel"
-				:icon-left="ICONS.FA_CHEVRON_LEFT"
-				:type="BUTTON_TYPES.TEXT"
-				class="ds-drawerHeader__secondLevel"
-				@click="$emit('backClicked')"
-			>
-				{{ t('ds.globals.back') }}
-			</ds-button>
-			<div :class="{ '-ds-hidden': isSecondLevel }" class="ds-drawerHeader__firstLevel">
-				<icon-button
-					v-if="hasBackButton"
-					:size="ICON_BUTTON_SIZES.MEDIUM"
-					:icon="ICONS.FA_CHEVRON_LEFT"
+	<div
+		class="ds-drawerHeader"
+		:class="{
+			'-ds-backgroundDefault': backgroundColor === DRAWER_HEADER_BACKGROUND_COLORS.DEFAULT,
+		}"
+	>
+		<div class="ds-drawerHeader__headerWrapper">
+			<div class="ds-drawerHeader__titleWrapper">
+				<ds-button
+					v-if="isSecondLevel"
+					:icon-left="ICONS.FA_CHEVRON_LEFT"
+					:type="BUTTON_TYPES.TEXT"
+					class="ds-drawerHeader__secondLevel"
 					@click="$emit('backClicked')"
-				/>
-				<div class="ds-drawerHeader__textWrapper">
-					<span
-						v-if="eyebrowText"
-						:class="{
-							'-ds-isInteractive': isInteractiveEyebrow,
-							'-ds-ellipsis': eyebrowEllipsis,
-						}"
-						class="ds-drawerHeader__eyebrow"
-						@click="isInteractiveEyebrow && $emit('eyebrowClicked')"
-					>
-						{{ eyebrowText }}
-					</span>
-					<div class="ds-drawerHeader__title">
-						<icon
-							v-if="leftIcon"
-							:icon="leftIcon"
-							:size="ICON_SIZES.X_SMALL"
-							class="ds-drawerHeader__leftIcon"
-						/>
+				>
+					{{ t('ds.globals.back') }}
+				</ds-button>
+				<div :class="{ '-ds-hidden': isSecondLevel }" class="ds-drawerHeader__firstLevel">
+					<icon-button
+						v-if="hasBackButton"
+						:size="ICON_BUTTON_SIZES.MEDIUM"
+						:icon="ICONS.FA_CHEVRON_LEFT"
+						@click="$emit('backClicked')"
+					/>
+					<div class="ds-drawerHeader__textWrapper">
 						<span
-							v-if="title"
-							class="ds-drawerHeader__titleText"
-							:class="{ '-ds-ellipsis': titleEllipsis, [`-ds-${titleColor}`]: true }"
-							:title="titleEllipsis ? title : undefined"
-							>{{ title }}</span
+							v-if="eyebrowText"
+							:class="{
+								'-ds-isInteractive': isInteractiveEyebrow,
+								'-ds-ellipsis': eyebrowEllipsis,
+							}"
+							class="ds-drawerHeader__eyebrow"
+							@click="isInteractiveEyebrow && $emit('eyebrowClicked')"
 						>
-						<chip v-if="chipLabel" :label="chipLabel" />
-						<div v-if="$slots.titleTrailing">
-							<slot name="titleTrailing" />
+							{{ eyebrowText }}
+						</span>
+						<div class="ds-drawerHeader__title">
+							<icon
+								v-if="leftIcon"
+								:icon="leftIcon"
+								:size="ICON_SIZES.X_SMALL"
+								class="ds-drawerHeader__leftIcon"
+							/>
+							<span
+								v-if="title"
+								class="ds-drawerHeader__titleText"
+								:class="{
+									'-ds-ellipsis': titleEllipsis,
+									[`-ds-${titleColor}`]: true,
+								}"
+								:title="titleEllipsis ? title : undefined"
+								>{{ title }}</span
+							>
+							<chip v-if="chipLabel" :label="chipLabel" />
+							<div v-if="$slots.titleTrailing">
+								<slot name="titleTrailing" />
+							</div>
 						</div>
 					</div>
 				</div>
+				<div v-if="$slots.actions" class="ds-drawerHeader__actions">
+					<slot name="actions" />
+				</div>
+				<icon-button
+					v-if="isClosable"
+					:color="ICON_COLORS.NEUTRAL"
+					:icon="ICONS.FA_XMARK"
+					:size="ICON_BUTTON_SIZES.MEDIUM"
+					@click="$emit('close')"
+				/>
 			</div>
-			<div v-if="$slots.actions" class="ds-drawerHeader__actions">
-				<slot name="actions" />
-			</div>
-			<icon-button
-				v-if="isClosable"
-				:color="ICON_COLORS.NEUTRAL"
-				:icon="ICONS.FA_XMARK"
-				:size="ICON_BUTTON_SIZES.MEDIUM"
-				@click="$emit('close')"
-			/>
+			<slot name="supporting" />
 		</div>
 		<divider v-if="hasDivider" :size="DIVIDER_SIZES.L" :prominence="DIVIDER_PROMINENCES.WEAK" />
 	</div>
@@ -76,6 +87,15 @@ $minimal-drawer-header-height: 58px;
 	display: flex;
 	flex-direction: column;
 
+	&.-ds-backgroundDefault {
+		background-color: $color-default-background;
+	}
+
+	&__headerWrapper {
+		min-height: $minimal-drawer-header-height;
+		padding: $space-6;
+	}
+
 	&__secondLevel {
 		position: absolute !important; // it is required so firstLevel content does not make component wider when hidden, and important is needed so component does not change its width when button was clicked
 	}
@@ -148,8 +168,6 @@ $minimal-drawer-header-height: 58px;
 		column-gap: $space-2;
 		display: flex;
 		justify-content: space-between;
-		min-height: $minimal-drawer-header-height;
-		padding: $space-6;
 	}
 
 	&__actions {
@@ -158,96 +176,61 @@ $minimal-drawer-header-height: 58px;
 }
 </style>
 
-<script lang="ts">
-import { defineComponent, PropType } from 'vue';
-
-import Button from '../../Buttons/Button/Button.vue';
-import Divider from '../../Divider/Divider.vue';
-import IconButton from '../../Buttons/IconButton/IconButton.vue';
-import Chip from '../../Chip/Chip.vue';
-import Icon from '../../Icons/Icon/Icon.vue';
-import { BUTTON_TYPES } from '../../Buttons/Button';
-import { ICON_COLORS, ICON_SIZES, ICONS } from '../../Icons/Icon';
-import { DIVIDER_PROMINENCES, DIVIDER_SIZES } from '../../Divider';
-import { ICON_BUTTON_SIZES } from '../../Buttons/IconButton';
-import { DRAWER_HEADER_TITLE_COLORS, DrawerHeaderTitleColor } from './DrawerHeader.consts';
+<script setup lang="ts">
+import DsButton, { BUTTON_TYPES } from '../../Buttons/Button';
+import Divider, { DIVIDER_PROMINENCES, DIVIDER_SIZES } from '../../Divider';
+import IconButton, { ICON_BUTTON_SIZES } from '../../Buttons/IconButton';
+import Chip from '../../Chip';
+import Icon, { ICON_COLORS, ICON_SIZES, ICONS, IconItem } from '../../Icons/Icon';
+import {
+	DRAWER_HEADER_BACKGROUND_COLORS,
+	DRAWER_HEADER_TITLE_COLORS,
+	DrawerHeaderBackgroundColor,
+	DrawerHeaderTitleColor,
+} from './DrawerHeader.consts';
 import { useLegacyI18n } from '../../../composables/useLegacyI18n';
 
-export default defineComponent({
-	name: 'DrawerHeader',
-	components: {
-		DsButton: Button,
-		Divider,
-		Icon,
-		IconButton,
-		Chip,
-	},
-	props: {
-		eyebrowText: {
-			type: String,
-			default: null,
-		},
-		isInteractiveEyebrow: {
-			type: Boolean,
-			default: false,
-		},
-		eyebrowEllipsis: {
-			type: Boolean,
-			default: false,
-		},
-		title: {
-			type: String,
-			default: null,
-		},
-		titleEllipsis: {
-			type: Boolean,
-			default: false,
-		},
-		titleColor: {
-			type: String as PropType<DrawerHeaderTitleColor>,
-			default: DRAWER_HEADER_TITLE_COLORS.NEUTRAL_STRONG,
-		},
-		leftIcon: {
-			type: [Object, null],
-			default: null,
-		},
-		chipLabel: {
-			type: String,
-			default: null,
-		},
-		isClosable: {
-			type: Boolean,
-			default: true,
-		},
-		hasDivider: {
-			type: Boolean,
-			default: false,
-		},
-		isSecondLevel: {
-			type: Boolean,
-			default: false,
-		},
-		hasBackButton: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	// TODO fix me when touching this file
-	// eslint-disable-next-line vue/require-emit-validator
-	emits: ['backClicked', 'close', 'eyebrowClicked'],
-	setup() {
-		const { t } = useLegacyI18n();
-
-		return {
-			t,
-			BUTTON_TYPES,
-			DIVIDER_SIZES,
-			DIVIDER_PROMINENCES,
-			ICONS,
-			ICON_BUTTON_SIZES,
-			ICON_SIZES,
-			ICON_COLORS,
-		};
-	},
-});
+const {
+	eyebrowText = null,
+	isInteractiveEyebrow = false,
+	eyebrowEllipsis = false,
+	title = null,
+	titleEllipsis = false,
+	titleColor = DRAWER_HEADER_TITLE_COLORS.NEUTRAL_STRONG,
+	leftIcon = null,
+	chipLabel = null,
+	isClosable = true,
+	hasDivider = false,
+	isSecondLevel = false,
+	hasBackButton = false,
+	backgroundColor = DRAWER_HEADER_BACKGROUND_COLORS.NONE,
+} = defineProps<{
+	eyebrowText?: string | null;
+	isInteractiveEyebrow?: boolean;
+	eyebrowEllipsis?: boolean;
+	title?: string | null;
+	titleEllipsis?: boolean;
+	titleColor?: DrawerHeaderTitleColor;
+	leftIcon?: IconItem | null;
+	chipLabel?: string | null;
+	isClosable?: boolean;
+	hasDivider?: boolean;
+	isSecondLevel?: boolean;
+	hasBackButton?: boolean;
+	backgroundColor?: DrawerHeaderBackgroundColor;
+}>();
+
+defineSlots<{
+	titleTrailing?: () => any;
+	actions?: () => any;
+	supporting?: () => any;
+}>();
+
+defineEmits<{
+	backClicked: [];
+	close: [];
+	eyebrowClicked: [];
+}>();
+
+const { t } = useLegacyI18n();
 </script>

package/lib/js/components/SurveyQuestions/SurveyQuestionOpenEnded/SurveyQuestionOpenEnded.vue

@@ -3,15 +3,13 @@
 		class="ds-surveyQuestionOpenEnded"
 		:class="{ '-ds-disabled': state === SURVEY_QUESTION_STATES.DISABLED }"
 	>
-		<ds-modal v-if="showModal" @close-modal="showModal = false">
+		<ds-modal
+			v-if="showModal"
+			:footer-secondary-button-text="t('ds.globals.confirmation')"
+			@close-modal="showModal = false"
+			@secondary-button-click="showModal = false"
+		>
 			<slot name="explanation" />
-			<template #footer>
-				<div>
-					<ds-button :type="BUTTON_TYPES.OUTLINED" @click="showModal = false">
-						{{ t('ds.globals.confirmation') }}
-					</ds-button>
-				</div>
-			</template>
 		</ds-modal>
 		<ds-card>
 			<template #content>
@@ -82,8 +80,7 @@
 
 <script lang="ts">
 import DsCard from '../../Cards/Card';
-import DsModal from '../../Modal';
-import DsButton, { BUTTON_TYPES } from '../../Buttons/Button';
+import DsModal from '../../Modals/Modal';
 import IconButton, { ICON_BUTTON_COLORS } from '../../Buttons/IconButton';
 import { ICON_SIZES, ICONS } from '../../Icons/Icon';
 import { SURVEY_QUESTION_STATES, SurveyQuestionState } from '../SurveyQuestion.consts';
@@ -97,7 +94,6 @@ export default defineComponent({
 	name: 'SurveyQuestionOpenEnded',
 	components: {
 		SurveyQuestionTextarea,
-		DsButton,
 		DsCard,
 		IconButton,
 		DsModal,
@@ -138,7 +134,6 @@ export default defineComponent({
 			ICONS: Object.freeze(ICONS),
 			ICON_BUTTON_COLORS: Object.freeze(ICON_BUTTON_COLORS),
 			ICON_SIZES: Object.freeze(ICON_SIZES),
-			BUTTON_TYPES: Object.freeze(BUTTON_TYPES),
 			SURVEY_QUESTION_STATES: Object.freeze(SURVEY_QUESTION_STATES),
 		};
 	},

package/lib/js/components/SurveyQuestions/SurveyQuestionScale/SurveyQuestionScale.vue

@@ -1,14 +1,12 @@
 <template>
 	<div class="ds-surveyQuestionScale">
-		<ds-modal v-if="showModal" @close-modal="showModal = false">
+		<ds-modal
+			v-if="showModal"
+			:footer-secondary-button-text="t('ds.globals.confirmation')"
+			@close-modal="showModal = false"
+			@secondary-button-click="showModal = false"
+		>
 			<slot name="explanation" />
-			<template #footer>
-				<div>
-					<ds-button :type="BUTTON_TYPES.OUTLINED" @click="showModal = false">
-						{{ t('ds.globals.confirmation') }}
-					</ds-button>
-				</div>
-			</template>
 		</ds-modal>
 		<ds-card>
 			<template #content>
@@ -234,8 +232,7 @@
 import DsCard from '../../Cards/Card';
 import IconButton, { ICON_BUTTON_COLORS } from '../../Buttons/IconButton';
 import { ICON_SIZES, ICONS } from '../../Icons/Icon';
-import DsButton, { BUTTON_TYPES } from '../../Buttons/Button';
-import DsModal from '../../Modal';
+import DsModal from '../../Modals/Modal';
 import SurveyToggle, {
 	SURVEY_TOGGLE_MEANINGS,
 	SURVEY_TOGGLE_STATES,
@@ -261,7 +258,6 @@ export default defineComponent({
 		IconButton,
 		SurveyToggle,
 		DsModal,
-		DsButton,
 	},
 	props: {
 		title: {
@@ -321,7 +317,6 @@ export default defineComponent({
 			ICONS: Object.freeze(ICONS),
 			ICON_SIZES: Object.freeze(ICON_SIZES),
 			ICON_BUTTON_COLORS: Object.freeze(ICON_BUTTON_COLORS),
-			BUTTON_TYPES: Object.freeze(BUTTON_TYPES),
 			SURVEY_TOGGLE_COLORS: Object.freeze(SURVEY_TOGGLE_MEANINGS),
 			SURVEY_TOGGLE_STATES: Object.freeze(SURVEY_TOGGLE_STATES),
 			SURVEY_TOGGLE_STATUSES: Object.freeze(SURVEY_TOGGLE_STATUSES),

package/lib/js/icons/fontawesome.ts

@@ -208,6 +208,7 @@ import { faCheck as fasCheck } from '@fortawesome/pro-solid-svg-icons/faCheck';
 import { faCircleCheck as fasCircleCheck } from '@fortawesome/pro-solid-svg-icons/faCircleCheck';
 import { faCirclePlay as fasCirclePlay } from '@fortawesome/pro-solid-svg-icons/faCirclePlay';
 import { faComment as fasComment } from '@fortawesome/pro-solid-svg-icons/faComment';
+import { faComments as fasComments } from '@fortawesome/pro-solid-svg-icons/faComments';
 import { faCompass as fasCompass } from '@fortawesome/pro-solid-svg-icons/faCompass';
 import { faExclamation as fasExclamation } from '@fortawesome/pro-solid-svg-icons/faExclamation';
 import { faFileLines as fasFileLines } from '@fortawesome/pro-solid-svg-icons/faFileLines';
@@ -247,6 +248,8 @@ import { faCircleDot as fasCircleDot } from '@fortawesome/pro-solid-svg-icons/fa
 import { faDot as fasDot } from '@fortawesome/pro-solid-svg-icons/faDot';
 import { faFlagCheckered as fasFlagCheckered } from '@fortawesome/pro-solid-svg-icons/faFlagCheckered';
 import { faSquare as fasSquare } from '@fortawesome/pro-solid-svg-icons/faSquare';
+import { faBellSlash as fasBellSlash } from '@fortawesome/pro-solid-svg-icons/faBellSlash';
+import { faBellOn as fasBellOn } from '@fortawesome/pro-solid-svg-icons/faBellOn';
 
 import { faChevronLeft as falChevronLeft } from '@fortawesome/pro-light-svg-icons/faChevronLeft';
 import { faChevronRight as falChevronRight } from '@fortawesome/pro-light-svg-icons/faChevronRight';
@@ -304,6 +307,8 @@ export const FONTAWESOME_ICONS = {
 	FA_BADGE_PERCENT: faBadgePercent,
 	FA_BAN: faBan,
 	FA_BARS: faBars,
+	FA_BELL_SLASH_SOLID: fasBellSlash,
+	FA_BELL_ON_SOLID: fasBellOn,
 	FA_BELL_SLASH: faBellSlash,
 	FA_BELL: faBell,
 	FA_BOLT: faBolt,
@@ -371,6 +376,7 @@ export const FONTAWESOME_ICONS = {
 	FA_COMMENT: faComment,
 	FA_COMMENTS_QUESTION_CHECK: faCommentsQuestionCheck,
 	FA_COMMENTS_QUESTION: faCommentsQuestion,
+	FA_COMMENTS_SOLID: fasComments,
 	FA_COMMENTS: faComments,
 	FA_COMPASS_SOLID: fasCompass,
 	FA_COMPRESS: faCompress,

package/lib/js/index.ts

@@ -46,7 +46,6 @@ export { default as IconButton } from './components/Buttons/IconButton';
 export { default as DsIconButton } from './components/Buttons/IconButton';
 export * from './components/Buttons/IconButton/IconButton.consts';
 export { default as DsInputField } from './components/Form/InputField';
-export { default as Modal } from './components/Modal';
 export { default as DsModal } from './components/Modals/Modal';
 export * from './components/Modals/Modal/Modal.consts';
 export { default as DsModalDialog } from './components/Modals/ModalDialog';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bethinkpl/design-system",
-  "version": "41.1.4",
+  "version": "42.0.0",
   "description": "Bethink universe design-system",
   "repository": {
     "type": "git",