@bagelink/vue 1.6.43 → 1.6.49

package/src/directives/vResize.ts

@@ -73,12 +73,12 @@ function initResize(el: HTMLElement, binding: { value?: ResizeOptions }) {
 	}
 
 	function applyGridSnapping(height: number): number {
-		if (!options.gridSize) {return height}
+		if (!options.gridSize) { return height }
 		return Math.round(height / options.gridSize) * options.gridSize
 	}
 
 	function handleMove(e: MouseEvent | TouchEvent) {
-		if (!isResizing) {return}
+		if (!isResizing) { return }
 		e.preventDefault()
 
 		const clientY = 'touches' in e ? e.touches[0].clientY : e.clientY
@@ -109,7 +109,7 @@ function initResize(el: HTMLElement, binding: { value?: ResizeOptions }) {
 	}
 
 	function handleEnd(e: MouseEvent | TouchEvent) {
-		if (!isResizing) {return}
+		if (!isResizing) { return }
 
 		const clientY = 'touches' in e ? e.changedTouches[0].clientY : e.clientY
 		const event = createResizeEvent(clientY)
@@ -136,7 +136,7 @@ function initResize(el: HTMLElement, binding: { value?: ResizeOptions }) {
 
 	function handleStart(e: MouseEvent | TouchEvent) {
 		// Only handle left mouse button for mouse events
-		if (e instanceof MouseEvent && 0 !== e.button) {return}
+		if (e instanceof MouseEvent && e.button !== 0) { return }
 
 		e.preventDefault()
 		isResizing = true
@@ -186,7 +186,7 @@ export const vResize: Directive<HTMLElement, ResizeOptions> = {
 
 	unmounted(el) {
 		const cleanup = (el as any)[RESIZE_KEY]
-		if ('function' === typeof cleanup) {
+		if (typeof cleanup === 'function') {
 			cleanup()
 			delete (el as any)[RESIZE_KEY]
 		}
@@ -195,7 +195,7 @@ export const vResize: Directive<HTMLElement, ResizeOptions> = {
 	updated(el, binding) {
 		if (binding.value !== binding.oldValue) {
 			const cleanup = (el as any)[RESIZE_KEY]
-			if ('function' === typeof cleanup) {
+			if (typeof cleanup === 'function') {
 				cleanup()
 				delete (el as any)[RESIZE_KEY]
 			}

package/src/index.ts

@@ -1,6 +1,7 @@
 export * from './components'
 export * from './components/form/useBagelFormState'
 export * from './composables'
+export * from './directives'
 export {
 	bagelInjectionKey,
 	type BagelOptions,

package/src/plugins/bagel.ts

@@ -14,7 +14,7 @@ export const i18nTInjectionKey = Symbol('bagel') as InjectionKey<(key: string) =
 
 export function injectI18nT(injectionKey: typeof i18nTInjectionKey = i18nTInjectionKey) {
 	const i18nT = inject(injectionKey)
-	if (!i18nT) {throw new Error('No i18nT provided')}
+	if (!i18nT) { throw new Error('No i18nT provided') }
 	return i18nT
 }
 
@@ -55,9 +55,9 @@ export const BagelVue: Plugin<BagelOptions> = {
 			},
 		})
 		const { availableLangs, defaultLang, lang } = useLang()
-		if (options.availableLangs) {availableLangs.value = options.availableLangs}
-		if (options.defaultLang) {defaultLang.value = options.defaultLang}
-		if (options.language) {lang.value = options.language}
+		if (options.availableLangs) { availableLangs.value = options.availableLangs }
+		if (options.defaultLang) { defaultLang.value = options.defaultLang }
+		if (options.language) { lang.value = options.language }
 		app.config.globalProperties.$bagel = bagel
 		app.provide(bagelInjectionKey, bagel)
 		app.config.globalProperties.$i18T

package/src/plugins/modalTypes.ts

@@ -46,7 +46,7 @@ export interface ModalFormComponentProps<T extends { [key: string]: any }> exten
 	modalOptions: ModalFormOptions<T>
 }
 
-export interface ModalFormOptions<T> {
+export interface ModalFormOptions<T> extends ModalOptions {
 	'schema': MaybeRefOrGetter<BglFormSchemaT<T>>
 	'modelValue'?: T
 	'onUpdate:modelValue'?: (val: T) => void
@@ -58,11 +58,4 @@ export interface ModalFormOptions<T> {
 	'deleteText'?: string
 	'duplicateText'?: string
 	'onError'?: (err: any) => void
-	'side'?: boolean
-	'title'?: string
-	'width'?: string
-	'dismissable'?: boolean
-	'visible'?: boolean
-	'actions'?: BtnOptions[]
-	'class'?: string
 }

package/src/plugins/useModal.ts

@@ -80,6 +80,11 @@ export const ModalPlugin: Plugin = {
 			// Make options reactive so updates propagate
 			const reactiveOptions = reactive(options) as ModalOptions | ModalFormOptions<T>
 
+			// Ensure visible is set for modals
+			if (!('visible' in reactiveOptions)) {
+				reactiveOptions.visible = true
+			}
+
 			const modalComponent = {
 				modalOptions: reactiveOptions,
 				modalType,
@@ -147,6 +152,11 @@ export const ModalPlugin: Plugin = {
 					// Calculate z-index based on stack position
 					const zIndex = BASE_Z_INDEX + index * 10
 
+					if (!modal || !modal.modalOptions) {
+						console.error('[BageLink Modal] Invalid modal in stack:', modal)
+						return null
+					}
+
 					const props = {
 						...modal.modalOptions,
 						'visible': true,
@@ -155,8 +165,14 @@ export const ModalPlugin: Plugin = {
 					}
 
 					switch (modal.modalType) {
-						case 'modalForm':
+						case 'modalForm': {
+							const formOptions = modal.modalOptions as ModalFormOptions<any>
+							if (!formOptions.schema) {
+								console.error('[BageLink Modal] ModalForm requires a schema', modal.modalOptions)
+								return null
+							}
 							return h(ModalForm, props as ComponentProps<typeof ModalForm>, modal.componentSlots)
+						}
 						case 'confirmModal':
 							return h(ModalConfirm, props as ModalConfirmOptions, {})
 						default:
@@ -171,27 +187,36 @@ export const ModalPlugin: Plugin = {
 
 		// Auto-mount modal container to document.body
 		if (typeof document !== 'undefined' && typeof window !== 'undefined') {
-			// Wait for app to be mounted before injecting
+			const mountModalContainer = () => {
+				const existingContainer = document.getElementById('bagelink-modal-root')
+				if (!existingContainer) {
+					// Create mount point
+					const container = document.createElement('div')
+					container.id = 'bagelink-modal-root'
+					document.body.appendChild(container)
+
+					// Create a separate app instance for modals to avoid context issues
+					const modalApp = createApp(ModalContainerComponent)
+
+					// Share the same context/plugins
+					modalApp._context = app._context
+
+					// Mount it
+					modalApp.mount(container)
+				}
+			}
+
+			// Try to mount immediately if DOM is ready
+			if (document.body) {
+				mountModalContainer()
+			}
+
+			// Also use mixin as fallback for cases where plugin is installed before DOM ready
 			app.mixin({
 				mounted() {
 					// Only run once on the root component
 					if (this.$root === this) {
-						const existingContainer = document.getElementById('bagelink-modal-root')
-						if (!existingContainer) {
-							// Create mount point
-							const container = document.createElement('div')
-							container.id = 'bagelink-modal-root'
-							document.body.appendChild(container)
-
-							// Create a separate app instance for modals to avoid context issues
-							const modalApp = createApp(ModalContainerComponent)
-
-							// Share the same context/plugins
-							modalApp._context = app._context
-
-							// Mount it
-							modalApp.mount(container)
-						}
+						mountModalContainer()
 					}
 				}
 			})

package/src/styles/layout.css

@@ -179,7 +179,7 @@
 }
 
 .align-items-baseline {
-    align-items: baseline;
+    align-items: baseline !important;
 }
 
 .align-items-end {

package/src/types/index.ts

@@ -37,7 +37,7 @@ export type ExtendedThemeType =
 	// Legacy light variants
 	| 'blue-light' | 'green-light' | 'red-light' | 'yellow-light' | 'purple-light' | 'brown-light'
 	| 'orange-light' | 'turquoise-light' | 'pink-light' | 'gray-light' | 'primary-light'
-	// Legacy tint variants  
+	// Legacy tint variants
 	| 'blue-tint' | 'red-tint' | 'primary-tint' | 'black-tint' | 'blue-dark' | 'light'
 	// 10% variants (lightest)
 	| 'blue-10' | 'green-10' | 'red-10' | 'yellow-10' | 'purple-10' | 'brown-10' | 'orange-10' | 'turquoise-10' | 'gray-10' | 'black-10' | 'pink-10'

package/src/utils/BagelFormUtils.ts

@@ -103,7 +103,7 @@ export function getBaseField<T, P extends Path<T, PO>, PO extends PathsOptions =
 	labelOrRest: string | Partial<BaseBagelField<T, P>> = {},
 	rest: Partial<BaseBagelField<T, P>> = {}
 ): BaseBagelField<T, P, PO> {
-	if ('object' === typeof labelOrRest) {return { id, ...labelOrRest }}
+	if (typeof labelOrRest === 'object') { return { id, ...labelOrRest } }
 	return { id, label: labelOrRest, ...rest }
 }
 
@@ -429,7 +429,7 @@ export function rangeField<
 }
 
 export function bglForm<T>(idOrField?: string | FieldByP<T, Path<T>>, ...schema: FieldByP<T, Path<T>>[]) {
-	if ('string' === typeof idOrField) {
+	if (typeof idOrField === 'string') {
 		return {
 			$el: 'bagelform',
 			id: idOrField,
@@ -497,13 +497,13 @@ export function colorField<
 
 export function findBglFieldById<T>(id: string, _schema: ShallowBglFormSchemaT<T>): FieldByP<T, Path<T>> | undefined {
 	for (const field of _schema) {
-		if (field.id === id) {return field as FieldByP<T, Path<T>> | undefined}
-		if (field.children && 0 < Number(field.children.length)) {
+		if (field.id === id) { return field as FieldByP<T, Path<T>> | undefined }
+		if (field.children && Number(field.children.length) > 0) {
 			const fieldChildren = field.children.filter(
-				c => 'object' === typeof c && '$el' in c
+				c => typeof c === 'object' && '$el' in c
 			)
 			const child = findBglFieldById(id, fieldChildren as ShallowBglFormSchemaT<T>)
-			if (child) {return child as FieldByP<T, Path<T>> | undefined}
+			if (child) { return child as FieldByP<T, Path<T>> | undefined }
 		}
 	}
 	return undefined
@@ -531,7 +531,7 @@ export function arrField<
 	options?: ArrayFieldOptions<T, P>
 ): ArrayBagelField<T, P, PO> {
 	const arraySpecificAttrs = (
-		 'string' === typeof schemaOrType
+		typeof schemaOrType === 'string'
 			? { type: schemaOrType }
 			: { schema: schemaOrType }
 	)

package/src/utils/calendar/Helpers.ts

@@ -11,7 +11,7 @@ export default class Helpers {
 	 * otherwise just use navigator.language
 	 */
 	static getBrowserNavigatorLocale(): string {
-		if ('object' !== typeof navigator) {return 'en-US'}
+		if (typeof navigator !== 'object') { return 'en-US' }
 
 		return navigator.languages && navigator.languages.length
 			? navigator.languages[0]
@@ -22,16 +22,16 @@ export default class Helpers {
 	 * Solution from https://github.com/vuejs/core/issues/4733#issuecomment-1024816095
 	 */
 	static hasSlotContent(slot: Slot | undefined) {
-		if (!slot) {return false}
+		if (!slot) { return false }
 
 		return slot().some((vnode: VNode) => {
-			if (vnode.type === Comment) {return false}
+			if (vnode.type === Comment) { return false }
 
-			if (Array.isArray(vnode.children) && !vnode.children.length) {return false}
+			if (Array.isArray(vnode.children) && !vnode.children.length) { return false }
 
 			return (
 				vnode.type !== Text
-				|| ('string' === typeof vnode.children && '' !== vnode.children.trim())
+				|| (typeof vnode.children === 'string' && vnode.children.trim() !== '')
 			)
 		})
 	}
@@ -43,9 +43,9 @@ export default class Helpers {
 		const isFullDayEvent = DATE_TIME_STRING_FULL_DAY_PATTERN.test(event.time.start)
 			&& DATE_TIME_STRING_FULL_DAY_PATTERN.test(event.time.end)
 
-		if (isTimedEvent) {return this.getTimedEventType(event, time)}
+		if (isTimedEvent) { return this.getTimedEventType(event, time) }
 
-		if (isFullDayEvent) {return this.getFullDayEventType(event, time)}
+		if (isFullDayEvent) { return this.getFullDayEventType(event, time) }
 
 		throw new Error('Event has invalid type')
 	}
@@ -81,6 +81,6 @@ export default class Helpers {
 	}
 
 	static isUIEventTouchEvent(event: UIEvent): boolean {
-		return 'touches' in event && 'object' === typeof event.touches
+		return 'touches' in event && typeof event.touches === 'object'
 	}
 }

package/src/utils/calendar/dateUtils.ts

@@ -112,8 +112,8 @@ const translations: Record<AvailableTimeLanguages, LanguageTranslations> = {
 }
 
 export function timeAgo(date: string | Date, lang: AvailableTimeLanguages = 'en') {
-	if (!date) {return ''}
-	if ('string' === typeof date) {date = new Date(date)}
+	if (!date) { return '' }
+	if (typeof date === 'string') { date = new Date(date) }
 	const now: Date = new Date()
 	const nowNumber = now.getTime()
 	const dateNumber = date.getTime()
@@ -133,32 +133,32 @@ export function timeAgo(date: string | Date, lang: AvailableTimeLanguages = 'en'
 
 	for (const interval of intervals) {
 		const count = Math.floor(Math.abs(seconds) / interval.seconds)
-		if (1 <= count) {
-			const suffix = 0 > seconds ? ` ${selectedLang.ago}` : ''
-			const prefix = 0 < seconds && 'in' !== selectedLang.in ? `${selectedLang.in} ` : ''
+		if (count >= 1) {
+			const suffix = seconds < 0 ? ` ${selectedLang.ago}` : ''
+			const prefix = seconds > 0 && selectedLang.in !== 'in' ? `${selectedLang.in} ` : ''
 
 			// Handle Hebrew plural forms
-			if ('he' === lang) {
+			if (lang === 'he') {
 				const timeUnit = selectedLang[interval.label] as TimeUnit
-				const form = 1 === count ? timeUnit.singular : timeUnit.plural
+				const form = count === 1 ? timeUnit.singular : timeUnit.plural
 
 				// For Hebrew, we place the prefix/suffix before the number
-				const hebrewPrefix = 0 > seconds ? `${selectedLang.ago} ` : (0 < seconds ? `${selectedLang.in} ` : '')
+				const hebrewPrefix = seconds < 0 ? `${selectedLang.ago} ` : (seconds > 0 ? `${selectedLang.in} ` : '')
 
-				if ('day' === interval.label && 0 < seconds) {
+				if (interval.label === 'day' && seconds > 0) {
 					const hours = Math.floor((Math.abs(seconds) % 86400) / 3600)
 					const hourUnit = selectedLang.hour as TimeUnit
-					const hourForm = 1 === hours ? hourUnit.singular : hourUnit.plural
-					return `${hebrewPrefix}${count} ${form}${ 0 < hours ? ` ${hours} ${hourForm}` : ''}`
+					const hourForm = hours === 1 ? hourUnit.singular : hourUnit.plural
+					return `${hebrewPrefix}${count} ${form}${hours > 0 ? ` ${hours} ${hourForm}` : ''}`
 				}
 				return `${hebrewPrefix}${count} ${form}`
 			}
 
 			// Handle other languages
-			if ('day' === interval.label && 0 < seconds) {
+			if (interval.label === 'day' && seconds > 0) {
 				const hours = Math.floor((Math.abs(seconds) % 86400) / 3600)
-				const hourLabel = 1 < hours ? `${selectedLang.hour}s` : selectedLang.hour
-				return `${prefix}${count} ${selectedLang[interval.label]}${ 0 < hours ? ` ${hours} ${hourLabel}` : ''}${suffix}`
+				const hourLabel = hours > 1 ? `${selectedLang.hour}s` : selectedLang.hour
+				return `${prefix}${count} ${selectedLang[interval.label]}${hours > 0 ? ` ${hours} ${hourLabel}` : ''}${suffix}`
 			}
 			return `${prefix}${count} ${selectedLang[interval.label]}${suffix}`
 		}
@@ -168,7 +168,7 @@ export function timeAgo(date: string | Date, lang: AvailableTimeLanguages = 'en'
 }
 
 function getBrowserNavigatorLocale(): string {
-	if ('object' !== typeof navigator) {return 'en-US'}
+	if (typeof navigator !== 'object') { return 'en-US' }
 	return navigator.languages && navigator.languages.length
 		? navigator.languages[0]
 		: navigator.language
@@ -182,7 +182,7 @@ function getBrowserNavigatorLocale(): string {
  */
 export function handleTimezone(date: Date, intFmtOpt: Intl.DateTimeFormatOptions): Date {
 	// If timeZone is UTC, convert to UTC directly
-	if ('UTC' === intFmtOpt.timeZone) {
+	if (intFmtOpt.timeZone === 'UTC') {
 		const utcDate = new Date(date.getTime())
 		utcDate.setMinutes(utcDate.getMinutes() + date.getTimezoneOffset())
 		return utcDate
@@ -203,7 +203,7 @@ export function handleTimezone(date: Date, intFmtOpt: Intl.DateTimeFormatOptions
 		const parts: Record<string, number> = {}
 
 		formattedParts.forEach((part) => {
-			if ('literal' !== part.type && 'timeZoneName' !== part.type) {
+			if (part.type !== 'literal' && part.type !== 'timeZoneName') {
 				parts[part.type] = Number.parseInt(part.value, 10)
 			}
 		})
@@ -305,10 +305,10 @@ export function formatDate(
 	let rest: Partial<Pick<Intl.DateTimeFormatOptions, 'hour12'>> = {}
 
 	// Handle both overloads
-	if ('string' === typeof formatOrOpts) {
+	if (typeof formatOrOpts === 'string') {
 		// First overload: format string directly
 		format = formatOrOpts
-	} else if (formatOrOpts && 'object' === typeof formatOrOpts) {
+	} else if (formatOrOpts && typeof formatOrOpts === 'object') {
 		// Second overload: options object
 		format = formatOrOpts.fmt
 		locale = formatOrOpts.locale
@@ -316,13 +316,13 @@ export function formatDate(
 		rest = formatOrOpts
 	}
 
-	if (!date) {return ''}
+	if (!date) { return '' }
 	format = format || 'DD.MM.YY'
 
 	locale = locale || getBrowserNavigatorLocale()
 	try {
 		// Validate the date
-		const d = 'string' === typeof date || 'number' === typeof date ? new Date(date) : date
+		const d = typeof date === 'string' || typeof date === 'number' ? new Date(date) : date
 
 		// Check if date is valid
 		if (Number.isNaN(d.getTime())) {
@@ -355,7 +355,7 @@ export function formatDate(
 		const partsMap: Partial<Record<Intl.DateTimeFormatPartTypes, string>> = {}
 
 		formattedParts.forEach((part) => {
-			if ('literal' !== part.type) {
+			if (part.type !== 'literal') {
 				partsMap[part.type] = part.value
 			}
 		})

package/src/utils/calendar/time.ts

@@ -57,7 +57,7 @@ export default class Time {
 			const dayEnd = Time.getHourFromTimePoints(this.DAY_END)
 			const dayStart = Time.getHourFromTimePoints(this.DAY_START)
 
-			if (dayEnd > dayStart) {return dayEnd - dayStart}
+			if (dayEnd > dayStart) { return dayEnd - dayStart }
 
 			return this.HOURS_PER_DAY - dayStart + dayEnd
 		})()
@@ -65,9 +65,9 @@ export default class Time {
 	}
 
 	get dayMode() {
-		if (0 === this.DAY_START && 2400 === this.DAY_END) {return DAY_MODE.REGULAR}
+		if (this.DAY_START === 0 && this.DAY_END === 2400) { return DAY_MODE.REGULAR }
 
-		if (this.DAY_START >= this.DAY_END) {return DAY_MODE.FLEXIBLE}
+		if (this.DAY_START >= this.DAY_END) { return DAY_MODE.FLEXIBLE }
 
 		return DAY_MODE.SHORTENED
 	}
@@ -86,13 +86,13 @@ export default class Time {
 	getCalendarWeekDateObjects(date: Date): calendarWeekType {
 		// If week starts on Sunday, we can get the first date of the week, by simply counting selectedDate.getDate() - selectedDate.getDay()
 		let subtractedDaysToGetFirstDate
-		if ('sunday' === this.FIRST_DAY_OF_WEEK) {
+		if (this.FIRST_DAY_OF_WEEK === 'sunday') {
 			subtractedDaysToGetFirstDate = date.getDay()
 		}
 		// However, if week starts on Monday, we need to make sure Mondays are represented as 0, instead of Sundays
 		else {
 			subtractedDaysToGetFirstDate
-        = 0 === date.getDay() ? 6 : date.getDay() - 1
+        = date.getDay() === 0 ? 6 : date.getDay() - 1
 		}
 
 		const dateOfFirstDayOfWeek = date.getDate() - subtractedDaysToGetFirstDate // First date of week is the date of the month - the day of the week
@@ -163,7 +163,7 @@ export default class Time {
 		const yearList: calendarYearMonths = []
 		let month = 0
 
-		while (11 >= month) {
+		while (month <= 11) {
 			yearList.push(new Date(year, month, 1))
 			month++
 		}
@@ -176,10 +176,10 @@ export default class Time {
 		let hour = '0'
 		let minutes = '0'
 
-		if (4 === time.length) {
+		if (time.length === 4) {
 			hour = time[0] + time[1]
 			minutes = time[2] + time[3]
-		} else if (3 === time.length) {
+		} else if (time.length === 3) {
 			hour = time[0]
 			minutes = time[1] + time[2]
 		}
@@ -209,7 +209,7 @@ export default class Time {
 			hour: '2-digit',
 		})
 
-		if ('0' === hourLocaleString[0]) {return hourLocaleString.substring(1)}
+		if (hourLocaleString[0] === '0') { return hourLocaleString.substring(1) }
 
 		return hourLocaleString
 	}
@@ -247,18 +247,18 @@ export default class Time {
 		const y = date.getFullYear()
 		const m = date.getMonth() + 1
 		const d = date.getDate()
-		const fullDate = `${y}-${ 10 <= m ? m : `0${m}`}-${ 10 <= d ? d : `0${d}`}`
+		const fullDate = `${y}-${m >= 10 ? m : `0${m}`}-${d >= 10 ? d : `0${d}`}`
 
 		if (!timeIsStartOrEndOfDay) {
 			const hour = date.getHours()
 			const minutes = date.getMinutes()
 
-			return `${fullDate} ${ 10 <= hour ? hour : `0${hour}`}:${
-				 10 <= minutes ? minutes : `0${minutes}`
+			return `${fullDate} ${hour >= 10 ? hour : `0${hour}`}:${
+				minutes >= 10 ? minutes : `0${minutes}`
 			}`
 		}
 
-		const fullTime = 'start' === timeIsStartOrEndOfDay ? '00:00' : '23:59'
+		const fullTime = timeIsStartOrEndOfDay === 'start' ? '00:00' : '23:59'
 
 		return `${fullDate} ${fullTime}`
 	}
@@ -331,7 +331,7 @@ export default class Time {
 			const monthIsSame = month === weekDay.getMonth()
 			const yearIsSame = fullYear === weekDay.getFullYear()
 
-			if (dateIsSame && monthIsSame && yearIsSame) {return true}
+			if (dateIsSame && monthIsSame && yearIsSame) { return true }
 		}
 
 		return false
@@ -342,7 +342,7 @@ export default class Time {
 		const mm = (date.getMonth() + 1)
 		const dd = date.getDate()
 
-		return `${yyyy}-${ 10 <= mm ? mm : `0${mm}`}-${ 10 <= dd ? dd : `0${dd}`}`
+		return `${yyyy}-${mm >= 10 ? mm : `0${mm}`}-${dd >= 10 ? dd : `0${dd}`}`
 	}
 
 	addMinutesToDateTimeString(minutes: number, dateTimeString: string) {
@@ -387,7 +387,7 @@ export default class Time {
 		const oneMinutePercentage = 100 / 60
 		const minutePoints = oneMinutePercentage * minutes
 
-		if (10 > minutePoints) {return `0${minutePoints}`}
+		if (minutePoints < 10) { return `0${minutePoints}` }
 
 		return minutePoints.toString()
 	}
@@ -430,8 +430,8 @@ export default class Time {
 		clickOffsetY: number,
 		weekHeight: number,
 	): string {
-		if (0 >= weekHeight) {throw new Error('weekHeight cannot be a negative number')}
-		if (0 > clickOffsetY) {throw new Error('clickOffsetY cannot be a negative number')}
+		if (weekHeight <= 0) { throw new Error('weekHeight cannot be a negative number') }
+		if (clickOffsetY < 0) { throw new Error('clickOffsetY cannot be a negative number') }
 
 		const dayStartHour = this.DAY_START / 100
 		const hourHeight = weekHeight / this.HOURS_PER_DAY
@@ -454,7 +454,7 @@ export default class Time {
 	}
 
 	setSegmentOfDateTimeString(dateTimeString: string, segments: { hour: number }) {
-		if (0 > segments.hour || 23 < segments.hour) {throw new Error('Invalid hour')}
+		if (segments.hour < 0 || segments.hour > 23) { throw new Error('Invalid hour') }
 		const newHour = this.doubleDigit(segments.hour)
 		dateTimeString = dateTimeString.replace(/\d{2}:/, `${newHour}:`)
 
@@ -469,21 +469,21 @@ export default class Time {
 	}
 
 	static getTimePointsFromHour(boundary: number) {
-		if (0 > boundary || 24 < boundary || 0 !== boundary % 1) {
+		if (boundary < 0 || boundary > 24 || boundary % 1 !== 0) {
 			throw new Error('Invalid day boundary')
 		}
 
-		if (0 === boundary) {return boundary}
+		if (boundary === 0) { return boundary }
 
 		return boundary * 100
 	}
 
 	static getHourFromTimePoints(timePoints: number) {
-		if (0 > timePoints || 2400 < timePoints || 0 !== timePoints % 100) {
+		if (timePoints < 0 || timePoints > 2400 || timePoints % 100 !== 0) {
 			throw new Error('Invalid time points')
 		}
 
-		if (0 === timePoints) {return timePoints}
+		if (timePoints === 0) { return timePoints }
 
 		return timePoints / 100
 	}
@@ -559,9 +559,9 @@ export default class Time {
 	}
 
 	doubleDigit(number: number) {
-		if (0 > number || 60 < number) {throw new Error('Invalid number. This is not a valid hour or minute')}
+		if (number < 0 || number > 60) { throw new Error('Invalid number. This is not a valid hour or minute') }
 
-		return 10 > number ? `0${number}` : String(number)
+		return number < 10 ? `0${number}` : String(number)
 	}
 }