@ui5/webcomponents-base 1.9.3 → 1.10.0

package/src/Keys.ts

@@ -0,0 +1,295 @@
+enum KeyCodes {
+	BACKSPACE = 8,
+	TAB = 9,
+	ENTER = 13,
+	SHIFT = 16,
+	CONTROL = 17,
+	ALT = 18,
+	BREAK = 19,
+	CAPS_LOCK = 20,
+	ESCAPE = 27,
+	SPACE = 32,
+	PAGE_UP = 33,
+	PAGE_DOWN = 34,
+	END = 35,
+	HOME = 36,
+	ARROW_LEFT = 37,
+	ARROW_UP = 38,
+	ARROW_RIGHT = 39,
+	ARROW_DOWN = 40,
+	PRINT = 44,
+	INSERT = 45,
+	DELETE = 46,
+	DIGIT_0 = 48,
+	DIGIT_1 = 49,
+	DIGIT_2 = 50,
+	DIGIT_3 = 51,
+	DIGIT_4 = 52,
+	DIGIT_5 = 53,
+	DIGIT_6 = 54,
+	DIGIT_7 = 55,
+	DIGIT_8 = 56,
+	DIGIT_9 = 57,
+	A = 65,
+	B = 66,
+	C = 67,
+	D = 68,
+	E = 69,
+	F = 70,
+	G = 71,
+	H = 72,
+	I = 73,
+	J = 74,
+	K = 75,
+	L = 76,
+	M = 77,
+	N = 78,
+	O = 79,
+	P = 80,
+	Q = 81,
+	R = 82,
+	S = 83,
+	T = 84,
+	U = 85,
+	V = 86,
+	W = 87,
+	X = 88,
+	Y = 89,
+	Z = 90,
+	WINDOWS = 91,
+	CONTEXT_MENU = 93,
+	TURN_OFF = 94,
+	SLEEP = 95,
+	NUMPAD_0 = 96,
+	NUMPAD_1 = 97,
+	NUMPAD_2 = 98,
+	NUMPAD_3 = 99,
+	NUMPAD_4 = 100,
+	NUMPAD_5 = 101,
+	NUMPAD_6 = 102,
+	NUMPAD_7 = 103,
+	NUMPAD_8 = 104,
+	NUMPAD_9 = 105,
+	NUMPAD_ASTERISK = 106,
+	NUMPAD_PLUS = 107,
+	NUMPAD_MINUS = 109,
+	NUMPAD_COMMA = 110,
+	NUMPAD_SLASH = 111,
+	F1 = 112,
+	F2 = 113,
+	F3 = 114,
+	F4 = 115,
+	F5 = 116,
+	F6 = 117,
+	F7 = 118,
+	F8 = 119,
+	F9 = 120,
+	F10 = 121,
+	F11 = 122,
+	F12 = 123,
+	NUM_LOCK = 144,
+	SCROLL_LOCK = 145,
+	OPEN_BRACKET = 186,
+	PLUS = 187,
+	COMMA = 188,
+	SLASH = 189,
+	DOT = 190,
+	PIPE = 191,
+	SEMICOLON = 192,
+	MINUS = 219,
+	GREAT_ACCENT = 220,
+	EQUALS = 221,
+	SINGLE_QUOTE = 222,
+	BACKSLASH = 226,
+}
+
+const isEnter = (event: KeyboardEvent): boolean => (event.key ? event.key === "Enter" : event.keyCode === KeyCodes.ENTER) && !hasModifierKeys(event);
+
+const isEnterShift = (event: KeyboardEvent): boolean => (event.key ? event.key === "Enter" : event.keyCode === KeyCodes.ENTER) && checkModifierKeys(event, false, false, true);
+
+const isSpace = (event: KeyboardEvent): boolean => (event.key ? (event.key === "Spacebar" || event.key === " ") : event.keyCode === KeyCodes.SPACE) && !hasModifierKeys(event);
+
+const isSpaceShift = (event: KeyboardEvent): boolean => (event.key ? (event.key === "Spacebar" || event.key === " ") : event.keyCode === KeyCodes.SPACE) && checkModifierKeys(event, false, false, true);
+
+const isSpaceCtrl = (event: KeyboardEvent): boolean => (event.key ? (event.key === "Spacebar" || event.key === " ") : event.keyCode === KeyCodes.SPACE) && checkModifierKeys(event, true, false, false);
+
+const isLeft = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowLeft" || event.key === "Left") : event.keyCode === KeyCodes.ARROW_LEFT) && !hasModifierKeys(event);
+
+const isRight = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowRight" || event.key === "Right") : event.keyCode === KeyCodes.ARROW_RIGHT) && !hasModifierKeys(event);
+
+const isUp = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowUp" || event.key === "Up") : event.keyCode === KeyCodes.ARROW_UP) && !hasModifierKeys(event);
+
+const isDown = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowDown" || event.key === "Down") : event.keyCode === KeyCodes.ARROW_DOWN) && !hasModifierKeys(event);
+
+const isLeftCtrl = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowLeft" || event.key === "Left") : event.keyCode === KeyCodes.ARROW_LEFT) && checkModifierKeys(event, true, false, false);
+
+const isRightCtrl = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowRight" || event.key === "Right") : event.keyCode === KeyCodes.ARROW_RIGHT) && checkModifierKeys(event, true, false, false);
+
+const isUpCtrl = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowUp" || event.key === "Up") : event.keyCode === KeyCodes.ARROW_UP) && checkModifierKeys(event, true, false, false);
+
+const isDownCtrl = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowDown" || event.key === "Down") : event.keyCode === KeyCodes.ARROW_DOWN) && checkModifierKeys(event, true, false, false);
+
+const isUpShift = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowUp" || event.key === "Up") : event.keyCode === KeyCodes.ARROW_UP) && checkModifierKeys(event, false, false, true);
+
+const isDownShift = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowDown" || event.key === "Down") : event.keyCode === KeyCodes.ARROW_DOWN) && checkModifierKeys(event, false, false, true);
+
+const isUpAlt = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowUp" || event.key === "Up") : event.keyCode === KeyCodes.ARROW_UP) && checkModifierKeys(event, false, true, false);
+
+const isDownAlt = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowDown" || event.key === "Down") : event.keyCode === KeyCodes.ARROW_DOWN) && checkModifierKeys(event, false, true, false);
+
+const isLeftShift = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowLeft" || event.key === "Left") : event.keyCode === KeyCodes.ARROW_LEFT) && checkModifierKeys(event, false, false, true);
+
+const isRightShift = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowRight" || event.key === "Right") : event.keyCode === KeyCodes.ARROW_RIGHT) && checkModifierKeys(event, false, false, true);
+
+const isLeftShiftCtrl = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowLeft" || event.key === "Left") : event.keyCode === KeyCodes.ARROW_LEFT) && checkModifierKeys(event, true, false, true);
+
+const isRightShiftCtrl = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowRight" || event.key === "Right") : event.keyCode === KeyCodes.ARROW_RIGHT) && checkModifierKeys(event, true, false, true);
+
+const isUpShiftCtrl = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowUp" || event.key === "Up") : event.keyCode === KeyCodes.ARROW_UP) && checkModifierKeys(event, true, false, true);
+
+const isDownShiftCtrl = (event: KeyboardEvent): boolean => (event.key ? (event.key === "ArrowDown" || event.key === "Down") : event.keyCode === KeyCodes.ARROW_DOWN) && checkModifierKeys(event, true, false, true);
+
+const isHome = (event: KeyboardEvent): boolean => (event.key ? event.key === "Home" : event.keyCode === KeyCodes.HOME) && !hasModifierKeys(event);
+
+const isEnd = (event: KeyboardEvent): boolean => (event.key ? event.key === "End" : event.keyCode === KeyCodes.END) && !hasModifierKeys(event);
+
+const isHomeCtrl = (event: KeyboardEvent): boolean => (event.key ? event.key === "Home" : event.keyCode === KeyCodes.HOME) && checkModifierKeys(event, true, false, false);
+
+const isHomeShift = (event: KeyboardEvent): boolean => (event.key ? event.key === "Home" : event.keyCode === KeyCodes.HOME) && checkModifierKeys(event, false, false, true);
+
+const isEndCtrl = (event: KeyboardEvent): boolean => (event.key ? event.key === "End" : event.keyCode === KeyCodes.END) && checkModifierKeys(event, true, false, false);
+
+const isEndShift = (event: KeyboardEvent): boolean => (event.key ? event.key === "End" : event.keyCode === KeyCodes.END) && checkModifierKeys(event, false, false, true);
+
+const isEscape = (event: KeyboardEvent): boolean => (event.key ? event.key === "Escape" || event.key === "Esc" : event.keyCode === KeyCodes.ESCAPE) && !hasModifierKeys(event);
+
+const isTabNext = (event: KeyboardEvent): boolean => (event.key ? event.key === "Tab" : event.keyCode === KeyCodes.TAB) && !hasModifierKeys(event);
+
+const isTabPrevious = (event: KeyboardEvent): boolean => (event.key ? event.key === "Tab" : event.keyCode === KeyCodes.TAB) && checkModifierKeys(event, /* Ctrl */ false, /* Alt */ false, /* Shift */ true);
+
+const isBackSpace = (event: KeyboardEvent): boolean => (event.key ? event.key === "Backspace" : event.keyCode === KeyCodes.BACKSPACE) && !hasModifierKeys(event);
+
+const isDelete = (event: KeyboardEvent): boolean => (event.key ? event.key === "Delete" : event.keyCode === KeyCodes.DELETE) && !hasModifierKeys(event);
+
+const isDeleteShift = (event: KeyboardEvent): boolean => (event.key ? event.key === "Delete" : event.keyCode === KeyCodes.DELETE) && checkModifierKeys(event, false, false, true);
+
+const isInsertShift = (event: KeyboardEvent): boolean => (event.key ? event.key === "Insert" : event.keyCode === KeyCodes.DELETE) && checkModifierKeys(event, false, false, true);
+
+const isInsertCtrl = (event: KeyboardEvent): boolean => (event.key ? event.key === "Insert" : event.keyCode === KeyCodes.DELETE) && checkModifierKeys(event, true, false, false);
+
+const isPageUp = (event: KeyboardEvent): boolean => (event.key ? event.key === "PageUp" : event.keyCode === KeyCodes.PAGE_UP) && !hasModifierKeys(event);
+
+const isPageDown = (event: KeyboardEvent): boolean => (event.key ? event.key === "PageDown" : event.keyCode === KeyCodes.PAGE_DOWN) && !hasModifierKeys(event);
+
+const isPageUpShift = (event: KeyboardEvent): boolean => (event.key ? event.key === "PageUp" : event.keyCode === KeyCodes.PAGE_UP) && checkModifierKeys(event, false, false, true);
+
+const isPageUpAlt = (event: KeyboardEvent): boolean => (event.key ? event.key === "PageUp" : event.keyCode === KeyCodes.PAGE_UP) && checkModifierKeys(event, false, true, false);
+
+const isPageDownShift = (event: KeyboardEvent): boolean => (event.key ? event.key === "PageDown" : event.keyCode === KeyCodes.PAGE_DOWN) && checkModifierKeys(event, false, false, true);
+
+const isPageDownAlt = (event: KeyboardEvent): boolean => (event.key ? event.key === "PageDown" : event.keyCode === KeyCodes.PAGE_DOWN) && checkModifierKeys(event, false, true, false);
+
+const isPageUpShiftCtrl = (event: KeyboardEvent): boolean => (event.key ? event.key === "PageUp" : event.keyCode === KeyCodes.PAGE_UP) && checkModifierKeys(event, true, false, true);
+
+const isPageDownShiftCtrl = (event: KeyboardEvent): boolean => (event.key ? event.key === "PageDown" : event.keyCode === KeyCodes.PAGE_DOWN) && checkModifierKeys(event, true, false, true);
+
+const isPlus = (event: KeyboardEvent): boolean => (event.key ? event.key === "+" : event.keyCode === KeyCodes.PLUS) || (event.keyCode === KeyCodes.NUMPAD_PLUS && !hasModifierKeys(event));
+
+const isMinus = (event: KeyboardEvent): boolean => (event.key ? event.key === "-" : event.keyCode === KeyCodes.MINUS) || (event.keyCode === KeyCodes.NUMPAD_MINUS && !hasModifierKeys(event));
+
+const isShow = (event: KeyboardEvent): boolean => {
+	if (event.key) {
+		return isF4(event) || isShowByArrows(event);
+	}
+
+	return (event.keyCode === KeyCodes.F4 && !hasModifierKeys(event)) || (event.keyCode === KeyCodes.ARROW_DOWN && checkModifierKeys(event, /* Ctrl */ false, /* Alt */ true, /* Shift */ false));
+};
+
+const isF4 = (event: KeyboardEvent): boolean => {
+	return event.key === "F4" && !hasModifierKeys(event);
+};
+
+const isF4Shift = (event: KeyboardEvent): boolean => (event.key ? event.key === "F4" : event.keyCode === KeyCodes.F4) && checkModifierKeys(event, false, false, true);
+
+const isF6Next = (event: KeyboardEvent): boolean => ((event.key ? event.key === "F6" : event.keyCode === KeyCodes.F6) && checkModifierKeys(event, false, false, false))
+	|| ((event.key ? (event.key === "ArrowDown" || event.key === "Down") : event.keyCode === KeyCodes.ARROW_DOWN) && checkModifierKeys(event, true, true, false));
+
+const isF6Previous = (event: KeyboardEvent): boolean => ((event.key ? event.key === "F6" : event.keyCode === KeyCodes.F6) && checkModifierKeys(event, false, false, true))
+	|| ((event.key ? (event.key === "ArrowUp" || event.key === "Up") : event.keyCode === KeyCodes.ARROW_UP) && checkModifierKeys(event, true, true, false));
+
+const isF7 = (event: KeyboardEvent): boolean => (event.key ? event.key === "F7" : event.keyCode === KeyCodes.F7) && !hasModifierKeys(event);
+
+const isShowByArrows = (event: KeyboardEvent): boolean => {
+	return ((event.key === "ArrowDown" || event.key === "Down") || (event.key === "ArrowUp" || event.key === "Up")) && checkModifierKeys(event, /* Ctrl */ false, /* Alt */ true, /* Shift */ false);
+};
+
+const isShift = (event: KeyboardEvent): boolean => event.key === "Shift" || event.keyCode === KeyCodes.SHIFT;
+
+const isCtrlA = (event: KeyboardEvent): boolean => ((event.key === "A" || event.key === "a") || event.which === KeyCodes.A) && checkModifierKeys(event, true, false, false);
+
+const isCtrlV = (event: KeyboardEvent): boolean => ((event.key === "V" || event.key === "v") || event.which === KeyCodes.V) && checkModifierKeys(event, true, false, false);
+
+const hasModifierKeys = (event: KeyboardEvent): boolean => event.shiftKey || event.altKey || getCtrlKey(event);
+
+const getCtrlKey = (event: KeyboardEvent): boolean => !!(event.metaKey || event.ctrlKey); // double negation doesn't have effect on boolean but ensures null and undefined are equivalent to false.
+
+const checkModifierKeys = (event: KeyboardEvent, bCtrlKey: boolean, bAltKey: boolean, bShiftKey: boolean):boolean => event.shiftKey === bShiftKey && event.altKey === bAltKey && getCtrlKey(event) === bCtrlKey;
+
+export {
+	isEnter,
+	isEnterShift,
+	isSpace,
+	isSpaceShift,
+	isSpaceCtrl,
+	isLeft,
+	isRight,
+	isUp,
+	isDown,
+	isLeftCtrl,
+	isRightCtrl,
+	isUpCtrl,
+	isDownCtrl,
+	isUpShift,
+	isDownShift,
+	isUpAlt,
+	isDownAlt,
+	isLeftShift,
+	isRightShift,
+	isLeftShiftCtrl,
+	isRightShiftCtrl,
+	isUpShiftCtrl,
+	isDownShiftCtrl,
+	isHome,
+	isEnd,
+	isPlus,
+	isMinus,
+	isHomeCtrl,
+	isEndCtrl,
+	isHomeShift,
+	isEndShift,
+	isEscape,
+	isTabNext,
+	isTabPrevious,
+	isBackSpace,
+	isDelete,
+	isShow,
+	isF4,
+	isF4Shift,
+	isF6Previous,
+	isF6Next,
+	isF7,
+	isPageUp,
+	isPageDown,
+	isPageUpShift,
+	isPageUpAlt,
+	isPageDownShift,
+	isPageDownAlt,
+	isPageUpShiftCtrl,
+	isPageDownShiftCtrl,
+	isShift,
+	isCtrlA,
+	isCtrlV,
+	isDeleteShift,
+	isInsertShift,
+	isInsertCtrl,
+};

package/src/ManagedStyles.ts

@@ -0,0 +1,92 @@
+import createStyleInHead from "./util/createStyleInHead.js";
+import createLinkInHead from "./util/createLinkInHead.js";
+import { shouldUseLinks, getUrl } from "./CSP.js";
+import { StyleData, StyleDataCSP } from "./types.js";
+
+const getStyleId = (name: string, value: string) => {
+	return value ? `${name}|${value}` : name;
+};
+
+const createStyle = (data: StyleData, name: string, value = "") => {
+	const content = typeof data === "string" ? data : data.content;
+
+	if (shouldUseLinks()) {
+		const attributes = {} as Record<string, any>;
+		attributes[name] = value;
+		const href = getUrl((data as StyleDataCSP).packageName, (data as StyleDataCSP).fileName);
+		createLinkInHead(href, attributes);
+	} else if (document.adoptedStyleSheets) {
+		const stylesheet = new CSSStyleSheet();
+		stylesheet.replaceSync(content);
+		(stylesheet as Record<string, any>)._ui5StyleId = getStyleId(name, value); // set an id so that we can find the style later
+		document.adoptedStyleSheets = [...document.adoptedStyleSheets, stylesheet];
+	} else {
+		const attributes = {} as Record<string, any>;
+		attributes[name] = value;
+		createStyleInHead(content, attributes);
+	}
+};
+
+const updateStyle = (data: StyleData, name: string, value = "") => {
+	const content = typeof data === "string" ? data : data.content;
+
+	if (shouldUseLinks()) {
+		const link = document.querySelector(`head>link[${name}="${value}"]`) as HTMLLinkElement;
+		link.href = getUrl((data as StyleDataCSP).packageName, (data as StyleDataCSP).fileName);
+	} else if (document.adoptedStyleSheets) {
+		const stylesheet = document.adoptedStyleSheets.find(sh => (sh as Record<string, any>)._ui5StyleId === getStyleId(name, value));
+		if (stylesheet) {
+			stylesheet.replaceSync(content || "");
+		}
+	} else {
+		const style = document.querySelector(`head>style[${name}="${value}"]`);
+		if (style) {
+			style.textContent = content || "";
+		}
+	}
+};
+
+const hasStyle = (name: string, value = "") => {
+	if (shouldUseLinks()) {
+		return !!document.querySelector(`head>link[${name}="${value}"]`);
+	}
+
+	if (document.adoptedStyleSheets) {
+		return !!document.adoptedStyleSheets.find(sh => (sh as Record<string, any>)._ui5StyleId === getStyleId(name, value));
+	}
+
+	return !!document.querySelector(`head>style[${name}="${value}"]`);
+};
+
+const removeStyle = (name: string, value = "") => {
+	if (shouldUseLinks()) {
+		const linkElement = document.querySelector(`head>link[${name}="${value}"]`);
+		linkElement?.parentElement?.removeChild(linkElement);
+	} else if (document.adoptedStyleSheets) {
+		document.adoptedStyleSheets = document.adoptedStyleSheets.filter(sh => (sh as Record<string, any>)._ui5StyleId !== getStyleId(name, value));
+	} else {
+		const styleElement = document.querySelector(`head > style[${name}="${value}"]`);
+		styleElement?.parentElement?.removeChild(styleElement);
+	}
+};
+
+const createOrUpdateStyle = (data: StyleData, name: string, value = "") => {
+	if (hasStyle(name, value)) {
+		updateStyle(data, name, value);
+	} else {
+		createStyle(data, name, value);
+	}
+};
+
+export {
+	createStyle,
+	hasStyle,
+	updateStyle,
+	removeStyle,
+	createOrUpdateStyle,
+};
+
+export type {
+	StyleData,
+	StyleDataCSP,
+};

package/src/MarkedEvents.ts

@@ -0,0 +1,20 @@
+const markedEvents = new WeakMap<Event, string>();
+
+/**
+ * Marks the given event with random marker.
+ */
+const markEvent = (event: Event, value: string) => {
+	markedEvents.set(event, value);
+};
+
+/**
+ * Returns the marker for the given event.
+ */
+const getEventMark = (event: Event): string | undefined => {
+	return markedEvents.get(event);
+};
+
+export {
+	markEvent,
+	getEventMark,
+};

package/src/{MediaRange.js → MediaRange.ts}

@@ -1,4 +1,37 @@
-const querySets = {};
+type Range = Map<string, Array<number>>;
+
+const mediaRanges = new Map<string, Range>();
+
+const DEAFULT_RANGE_SET: Range = new Map<string, Array<number>>();
+DEAFULT_RANGE_SET.set("S", [0, 599]);
+DEAFULT_RANGE_SET.set("M", [600, 1023]);
+DEAFULT_RANGE_SET.set("L", [1024, 1439]);
+DEAFULT_RANGE_SET.set("XL", [1440, Infinity]);
+
+/**
+ * Enumeration containing the names and settings of predefined screen width media query range sets.
+ *
+ * @namespace
+ * @name MediaRange.RANGESETS
+ * @public
+ */
+ enum RANGESETS {
+	/**
+	 * A 4-step range set (S-M-L-XL).
+	 *
+	 * The ranges of this set are:
+	 * <ul>
+	 * <li><code>"S"</code>: For screens smaller than 600 pixels.</li>
+	 * <li><code>"M"</code>: For screens greater than or equal to 600 pixels and smaller than 1024 pixels.</li>
+	 * <li><code>"L"</code>: For screens greater than or equal to 1024 pixels and smaller than 1440 pixels.</li>
+	 * <li><code>"XL"</code>: For screens greater than or equal to 1440 pixels.</li>
+	 * </ul>
+	 *
+	 * @name MediaRange.RANGESETS.RANGE_4STEPS
+	 * @public
+	 */
+	RANGE_4STEPS = "4Step",
+}
 
 /**
  * Initializes a screen width media query range set.
@@ -18,20 +51,11 @@ const querySets = {};
  *
  * @param {string} name The name of the range set to be initialized.
  * The name must be a valid id and consist only of letters and numeric digits.
- *
- * @param {int[]} [borders] The range borders
- *
- * @param {string[]} [names] The names of the ranges. The names must be a valid id and consist only of letters and digits.
- *
+ * @param {Range} [range] The given range set.
  * @name MediaRange.initRangeSet
- * @function
- * @public
  */
-const _initRangeSet = (name, borders, names) => {
-	querySets[name] = {
-		borders,
-		names,
-	};
+const initRangeSet = (name: string, range: Range) => {
+	mediaRanges.set(name, range);
 };
 
 /**
@@ -41,54 +65,31 @@ const _initRangeSet = (name, borders, names) => {
  * otherwise it is determined for the current window size.
  *
  * @param {string} name The name of the range set. The range set must be initialized beforehand ({@link MediaRange.initRangeSet})
- * @param {int} [width] An optional width, based on which the range should be determined;
- *             If <code>width</code> is not provided, the window size will be used.
+ * @param {number} [width] An optional width, based on which the range should be determined;
+ * If <code>width</code> is not provided, the window size will be used.
  * @returns {string} The name of the current active interval of the range set.
  *
  * @name MediaRange.getCurrentRange
  * @function
  * @public
  */
-const _getCurrentRange = (name, width = window.innerWidth) => {
-	const querySet = querySets[name];
-	let i = 0;
+const getCurrentRange = (name: string, width = window.innerWidth): string => {
+	let rangeSet = mediaRanges.get(name);
 
-	if (!querySet) {
-		return null;
+	if (!rangeSet) {
+		rangeSet = mediaRanges.get(RANGESETS.RANGE_4STEPS)!;
 	}
 
-	for (; i < querySet.borders.length; i++) {
-		if (width < querySet.borders[i]) {
-			return querySet.names[i];
-		}
-	}
+	let currentRangeName;
+	const effectiveWidth = Math.floor(width);
 
-	return querySet.names[i];
-};
+	rangeSet.forEach((value, key) => {
+		if (effectiveWidth >= value[0] && effectiveWidth <= value[1]) {
+			currentRangeName = key;
+		}
+	});
 
-/**
- * Enumeration containing the names and settings of predefined screen width media query range sets.
- *
- * @namespace
- * @name MediaRange.RANGESETS
- * @public
- */
-const RANGESETS = {
-	/**
-	 * A 4-step range set (S-M-L-XL).
-	 *
-	 * The ranges of this set are:
-	 * <ul>
-	 * <li><code>"S"</code>: For screens smaller than 600 pixels.</li>
-	 * <li><code>"M"</code>: For screens greater than or equal to 600 pixels and smaller than 1024 pixels.</li>
-	 * <li><code>"L"</code>: For screens greater than or equal to 1024 pixels and smaller than 1440 pixels.</li>
-	 * <li><code>"XL"</code>: For screens greater than or equal to 1440 pixels.</li>
-	 * </ul>
-	 *
-	 * @name MediaRange.RANGESETS.RANGE_4STEPS
-	 * @public
-	 */
-	RANGE_4STEPS: "4Step",
+	return currentRangeName || [...rangeSet.keys()][0];
 };
 
 /**
@@ -100,10 +101,10 @@ const RANGESETS = {
 
 const MediaRange = {
 	RANGESETS,
-	initRangeSet: _initRangeSet,
-	getCurrentRange: _getCurrentRange,
+	initRangeSet,
+	getCurrentRange,
 };
 
-MediaRange.initRangeSet(MediaRange.RANGESETS.RANGE_4STEPS, [600, 1024, 1440], ["S", "M", "L", "XL"]);
+MediaRange.initRangeSet(MediaRange.RANGESETS.RANGE_4STEPS, DEAFULT_RANGE_SET);
 
 export default MediaRange;

package/src/{PropertiesFileFormat.js → PropertiesFileFormat.ts}

@@ -1,9 +1,9 @@
-const flatstr = typeof chrome === "object" || typeof v8 === "object" ? (s, iConcatOps) => {
+const flatstr = typeof window.chrome === "object" || typeof window.v8 === "object" ? (s: string, iConcatOps: number) => {
 	if (iConcatOps > 2 && 40 * iConcatOps > s.length) {
 		Number(s);
 	}
 	return s;
-} : s => s;
+} : (s: string) => s;
 
 const rLines = /(?:\r\n|\r|\n|^)[ \t\f]*/;
 const rEscapesOrSeparator = /(\\u[0-9a-fA-F]{0,4})|(\\.)|(\\$)|([ \t\f]*[ \t\f:=][ \t\f]*)/g;
@@ -21,20 +21,20 @@ const mEscapes = {
  * @returns a object with key/value pairs parsed from the .properties file format
  * @public
  */
-const parseProperties = sText => {
+const parseProperties = (sText: string) => {
 	const properties = {},
 		aLines = sText.split(rLines);
 
 	let sLine,
 		rMatcher,
 		sKey,
-		sValue,
+		sValue: string,
 		i,
 		m,
 		iLastIndex,
-		iConcatOps;
+		iConcatOps: number;
 
-	const append = s => {
+	const append = (s: string) => {
 		if (sValue) {
 			sValue = `${sValue}${s}`;
 			iConcatOps++;
@@ -66,7 +66,7 @@ const parseProperties = sText => {
 					}
 					append(String.fromCharCode(parseInt(m[1].slice(2), 16)));
 				} else if (m[2]) {
-					append(mEscapes[m[2]] || m[2].slice(1));
+					append(mEscapes[m[2] as keyof typeof mEscapes] || m[2].slice(1));
 				} else if (m[3]) {
 					sLine = aLines[++i];
 					iLastIndex = 0;
@@ -86,7 +86,7 @@ const parseProperties = sText => {
 				sKey = sValue;
 				sValue = "";
 			}
-			properties[sKey] = flatstr(sValue, sValue ? iConcatOps : 0);
+			(properties as Record<string, any>)[sKey] = flatstr(sValue, sValue ? iConcatOps! : 0);
 		}
 	}
 	return properties;