@osimatic/helpers-js 1.5.14 → 1.5.16

package/http_client.js

@@ -502,6 +502,4 @@ class HTTPClient {
 
 }
 
-require('whatwg-fetch'); //fetch polyfill loaded in window.fetch
-
 module.exports = { HTTPClient };

package/media.js

@@ -182,7 +182,7 @@ class UserMedia {
 					if (errName === 'NotAllowedError') {
 						errorType = "UserPermissionDenied";
 					}
-				} else if (browserName === 'Microsoft Edge') {
+				} else if (browserName === 'Edge') {
 					if (errName === 'NotAllowedError') {
 						errorType = "UserPermissionDenied";
 					} else if (errName === 'NotReadableError') {

package/open_street_map.js

@@ -30,16 +30,16 @@ class OpenStreetMap {
 
 	static createMap(mapContainer, options={}) {
 		mapContainer = toEl(mapContainer);
-		if (!mapContainer.length) {
+		if (!mapContainer) {
 			return null;
 		}
 
-		const container = L.DomUtil.get(mapContainer[0]);
+		const container = L.DomUtil.get(mapContainer);
 		if (container != null) {
 			container._leaflet_id = null;
 		}
 
-		const map = L.map(mapContainer[0], options);
+		const map = L.map(mapContainer, options);
 
 		L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 			attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.5.14",
+  "version": "1.5.16",
   "main": "main.js",
   "scripts": {
     "test": "jest",
@@ -24,8 +24,7 @@
   },
   "devDependencies": {
     "jest": "^30.2.0",
-    "jest-environment-jsdom": "^30.2.0",
-    "whatwg-fetch": "^3.6.20"
+    "jest-environment-jsdom": "^30.2.0"
   },
   "publishConfig": {
     "access": "public"

package/tests/form_helper.test.js

@@ -482,29 +482,6 @@ describe('FormHelper', () => {
 			expect(passwordInput.type).toBe('password');
 		});
 
-		test('should set max-width on date inputs when Modernizr.inputtypes.date is false', () => {
-			const form = setupForm();
-			const dateInput = addInput(form, 'mydate', 'date');
-			global.Modernizr = { inputtypes: { date: false, time: true } };
-
-			FormHelper.initTypeFields(form);
-
-			expect(dateInput.style.maxWidth).toBe('120px');
-			delete global.Modernizr;
-		});
-
-		test('should set placeholder on time inputs when Modernizr.inputtypes.time is false', () => {
-			const form = setupForm();
-			const timeInput = addInput(form, 'mytime', 'time');
-			global.Modernizr = { inputtypes: { date: true, time: false } };
-
-			FormHelper.initTypeFields(form);
-
-			expect(timeInput.style.maxWidth).toBe('100px');
-			expect(timeInput.placeholder).toBe('hh:mm');
-			delete global.Modernizr;
-		});
-
 		test('should skip Modernizr block when Modernizr not defined', () => {
 			const form = setupForm();
 			addInput(form, 'password', 'password');

package/tests/media.test.js

@@ -1,10 +1,3 @@
-// Mock bowser module before requiring media.js (bowser is used inside requestMediaPermissions)
-jest.mock('bowser', () => ({
-	getParser: jest.fn(() => ({
-		getBrowserName: jest.fn(() => 'Chrome')
-	}))
-}), { virtual: true });
-
 const { AudioMedia, VideoMedia, UserMedia } = require('../media');
 
 describe('media.js', () => {
@@ -100,9 +93,13 @@ describe('media.js', () => {
 			});
 		});
 
-		describe('requestMediaPermissions', () => {
-			const bowser = require('bowser');
+		const UA_CHROME = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36';
+		const UA_FIREFOX = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:120.0) Gecko/20100101 Firefox/120.0';
+		const UA_SAFARI = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 14_0) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15';
+		const UA_EDGE = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0';
+		const UA_OPERA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 OPR/106.0.0.0';
 
+		describe('requestMediaPermissions', () => {
 			beforeEach(() => {
 				global.navigator = {
 					mediaDevices: {
@@ -110,18 +107,13 @@ describe('media.js', () => {
 					}
 				};
 				global.window = {
-					navigator: {
-						userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
-					}
+					navigator: { userAgent: UA_CHROME }
 				};
 			});
 
 			test('should resolve with stream on success', async () => {
 				const mockStream = { id: 'test-stream' };
 				global.navigator.mediaDevices.getUserMedia.mockResolvedValue(mockStream);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Chrome')
-				});
 
 				const result = await UserMedia.requestMediaPermissions({ audio: true, video: true });
 
@@ -132,9 +124,6 @@ describe('media.js', () => {
 			test('should use default constraints when not provided', async () => {
 				const mockStream = { id: 'test-stream' };
 				global.navigator.mediaDevices.getUserMedia.mockResolvedValue(mockStream);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Chrome')
-				});
 
 				await UserMedia.requestMediaPermissions();
 
@@ -145,9 +134,6 @@ describe('media.js', () => {
 				const error = new Error('Permission denied by system');
 				error.name = 'NotAllowedError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Chrome')
-				});
 
 				await expect(UserMedia.requestMediaPermissions({ audio: true }))
 					.rejects.toEqual({
@@ -161,9 +147,6 @@ describe('media.js', () => {
 				const error = new Error('Permission denied');
 				error.name = 'NotAllowedError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Chrome')
-				});
 
 				await expect(UserMedia.requestMediaPermissions({ audio: true }))
 					.rejects.toEqual({
@@ -177,9 +160,6 @@ describe('media.js', () => {
 				const error = new Error('Could not start video source');
 				error.name = 'NotReadableError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Chrome')
-				});
 
 				await expect(UserMedia.requestMediaPermissions({ video: true }))
 					.rejects.toEqual({
@@ -193,9 +173,7 @@ describe('media.js', () => {
 				const error = new Error('Permission denied');
 				error.name = 'NotAllowedError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Safari')
-				});
+				global.window.navigator.userAgent = UA_SAFARI;
 
 				await expect(UserMedia.requestMediaPermissions({ audio: true }))
 					.rejects.toEqual({
@@ -209,9 +187,7 @@ describe('media.js', () => {
 				const error = new Error('Permission denied');
 				error.name = 'NotAllowedError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Microsoft Edge')
-				});
+				global.window.navigator.userAgent = UA_EDGE;
 
 				await expect(UserMedia.requestMediaPermissions({ audio: true }))
 					.rejects.toEqual({
@@ -225,9 +201,7 @@ describe('media.js', () => {
 				const error = new Error('Could not start video source');
 				error.name = 'NotReadableError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Microsoft Edge')
-				});
+				global.window.navigator.userAgent = UA_EDGE;
 
 				await expect(UserMedia.requestMediaPermissions({ video: true }))
 					.rejects.toEqual({
@@ -241,9 +215,7 @@ describe('media.js', () => {
 				const error = new Error('Requested device not found');
 				error.name = 'NotFoundError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Firefox')
-				});
+				global.window.navigator.userAgent = UA_FIREFOX;
 
 				await expect(UserMedia.requestMediaPermissions({ audio: true }))
 					.rejects.toEqual({
@@ -257,9 +229,7 @@ describe('media.js', () => {
 				const error = new Error('Media device not readable');
 				error.name = 'NotReadableError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Firefox')
-				});
+				global.window.navigator.userAgent = UA_FIREFOX;
 
 				await expect(UserMedia.requestMediaPermissions({ audio: true }))
 					.rejects.toEqual({
@@ -273,9 +243,7 @@ describe('media.js', () => {
 				const error = new Error('Permission denied');
 				error.name = 'NotAllowedError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Firefox')
-				});
+				global.window.navigator.userAgent = UA_FIREFOX;
 
 				await expect(UserMedia.requestMediaPermissions({ audio: true }))
 					.rejects.toEqual({
@@ -289,9 +257,7 @@ describe('media.js', () => {
 				const error = new Error('Operation aborted');
 				error.name = 'AbortError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Firefox')
-				});
+				global.window.navigator.userAgent = UA_FIREFOX;
 
 				await expect(UserMedia.requestMediaPermissions({ audio: true }))
 					.rejects.toEqual({
@@ -305,9 +271,7 @@ describe('media.js', () => {
 				const error = new Error('Unknown error');
 				error.name = 'UnknownError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Opera')
-				});
+				global.window.navigator.userAgent = UA_OPERA;
 
 				await expect(UserMedia.requestMediaPermissions({ audio: true }))
 					.rejects.toEqual({
@@ -321,9 +285,6 @@ describe('media.js', () => {
 				const error = new Error('Weird error');
 				error.name = 'WeirdError';
 				global.navigator.mediaDevices.getUserMedia.mockRejectedValue(error);
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Chrome')
-				});
 
 				await expect(UserMedia.requestMediaPermissions({ audio: true }))
 					.rejects.toEqual({
@@ -342,14 +303,8 @@ describe('media.js', () => {
 					}
 				};
 				global.window = {
-					navigator: {
-						userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
-					}
+					navigator: { userAgent: UA_CHROME }
 				};
-				const bowser = require('bowser');
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Chrome')
-				});
 			});
 
 			test('should call requestMediaPermissions with audio:true, video:false', async () => {
@@ -387,14 +342,8 @@ describe('media.js', () => {
 					}
 				};
 				global.window = {
-					navigator: {
-						userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
-					}
+					navigator: { userAgent: UA_CHROME }
 				};
-				const bowser = require('bowser');
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Chrome')
-				});
 			});
 
 			test('should call requestMediaPermissions with audio and video', async () => {
@@ -433,14 +382,8 @@ describe('media.js', () => {
 					}
 				};
 				global.window = {
-					navigator: {
-						userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
-					}
+					navigator: { userAgent: UA_CHROME }
 				};
-				const bowser = require('bowser');
-				bowser.getParser.mockReturnValue({
-					getBrowserName: jest.fn().mockReturnValue('Chrome')
-				});
 			});
 
 			test('should call requestMediaPermissions with audio:false, video:true', async () => {

package/tests/open_street_map.test.js

@@ -215,6 +215,100 @@ describe('OpenStreetMap', () => {
 		});
 	});
 
+	describe('createMap', () => {
+		let mockMap;
+		let mockTileLayer;
+		let domUtilGetSpy;
+		let mapSpy;
+		let tileLayerSpy;
+
+		beforeEach(() => {
+			mockMap = {
+				setView: jest.fn(),
+				getZoom: jest.fn(() => 6),
+				setZoom: jest.fn(),
+				fitBounds: jest.fn(),
+				invalidateSize: jest.fn(),
+			};
+			mockTileLayer = { addTo: jest.fn() };
+			domUtilGetSpy = jest.spyOn(L.DomUtil, 'get').mockReturnValue(null);
+			mapSpy = jest.spyOn(L, 'map').mockReturnValue(mockMap);
+			tileLayerSpy = jest.spyOn(L, 'tileLayer').mockReturnValue(mockTileLayer);
+		});
+
+		afterEach(() => {
+			domUtilGetSpy.mockRestore();
+			mapSpy.mockRestore();
+			tileLayerSpy.mockRestore();
+		});
+
+		test('should return null when mapContainer is null', () => {
+			const result = OpenStreetMap.createMap(null);
+
+			expect(result).toBeNull();
+			expect(mapSpy).not.toHaveBeenCalled();
+		});
+
+		test('should return null when mapContainer is undefined', () => {
+			const result = OpenStreetMap.createMap(undefined);
+
+			expect(result).toBeNull();
+			expect(mapSpy).not.toHaveBeenCalled();
+		});
+
+		test('should create and return a Leaflet map for a valid DOM element', () => {
+			const div = document.createElement('div');
+			document.body.appendChild(div);
+
+			const result = OpenStreetMap.createMap(div);
+
+			expect(mapSpy).toHaveBeenCalledWith(div, {});
+			expect(tileLayerSpy).toHaveBeenCalled();
+			expect(mockTileLayer.addTo).toHaveBeenCalledWith(mockMap);
+			expect(result).toBe(mockMap);
+
+			document.body.removeChild(div);
+		});
+
+		test('should reset _leaflet_id when container already has one', () => {
+			const div = document.createElement('div');
+			document.body.appendChild(div);
+			const existingContainer = { _leaflet_id: 42 };
+			domUtilGetSpy.mockReturnValue(existingContainer);
+
+			OpenStreetMap.createMap(div);
+
+			expect(existingContainer._leaflet_id).toBeNull();
+
+			document.body.removeChild(div);
+		});
+
+		test('should pass options to L.map', () => {
+			const div = document.createElement('div');
+			document.body.appendChild(div);
+			const options = { zoomControl: false };
+
+			OpenStreetMap.createMap(div, options);
+
+			expect(mapSpy).toHaveBeenCalledWith(div, options);
+
+			document.body.removeChild(div);
+		});
+
+		test('should center on France by default', () => {
+			const div = document.createElement('div');
+			document.body.appendChild(div);
+			const fitBoundsSpy = jest.spyOn(L, 'latLngBounds').mockReturnValue({ _bounds: [] });
+
+			OpenStreetMap.createMap(div);
+
+			expect(mockMap.fitBounds).toHaveBeenCalled();
+
+			fitBoundsSpy.mockRestore();
+			document.body.removeChild(div);
+		});
+	});
+
 	describe('centerOnFrance', () => {
 		test('should call setView with France coordinates', () => {
 			const mockMap = {