Merge branch 'main' into feature/add-spanish-language

# Conflicts:
#	packages/map-template/CHANGELOG.md

packages/map-template/CHANGELOG.md

@@ -11,6 +11,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add support for Italian and Spanish languages.
 
+## [1.48.2] - 2024-06-14
+
+### Fixed
+
+- Fixed an issue where the text in the Legend Information Modal in the Kiosk mode did not follow the expected formatting.
+
+## [1.48.1] - 2024-06-14
+
+### Fixed
+
+- Fixed an issue with clearing search input causing console errrors.
+
 ## [1.48.0] - 2024-06-13
 
 ### Added
@@ -45,7 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fixed bottom sheet jumping outside the viewport when selecting a category. 
+- Fixed bottom sheet jumping outside the viewport when selecting a category.
 
 ## [1.44.1] - 2024-04-23
 
@@ -63,13 +75,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fix the venue not updating correctly on the map. 
+- Fix the venue not updating correctly on the map.
 
 ## [1.43.0] - 2024-03-26
 
 ### Added
 
-- Add support for new parameter `searchAllVenues` which searches across all venues in one solution. 
+- Add support for new parameter `searchAllVenues` which searches across all venues in one solution.
 - Change the default behaviour to search in one venue.
 
 ## [1.42.0] - 2024-03-26
@@ -86,43 +98,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.40.0] - 2024-03-06
 
-### Added 
+### Added
 
 - Added Sentry for Error Logging and Performance Metrics
 
 ## [1.39.1] - 2024-03-04
 
-### Added 
+### Added
 
 - Added docs for `category` prop.
 
 ## [1.39.0] - 2024-02-29
 
-### Added 
+### Added
 
 - Added legend modal to the kiosk.
 
 ## [1.38.1] - 2024-02-28
 
-### Fixed 
+### Fixed
 
 - Added missing `language` prop to web component.
 
 ## [1.38.0] - 2024-02-28
 
-### Added 
+### Added
 
 - Added support for `category` property.
 
 ## [1.37.1] - 2024-02-26
 
-### Fixed 
+### Fixed
 
 - Fix size of the images on the Location Details page.
 
 ## [1.37.0] - 2024-02-22
 
-### Added 
+### Added
 
 - Remove hover from non-selectable locations.
 
@@ -209,7 +221,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Added vertical scroll buttons to the search results list
-- Added horizontal scroll buttons to the categories list 
+- Added horizontal scroll buttons to the categories list
 
 ## [1.32.0] - 2024-01-24
 

packages/map-template/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mapsindoors/map-template",
   "description": "Get a MapsIndoors map up and running in less than 10 mins.",
-  "version": "1.48.0",
+  "version": "1.48.1",
   "private": false,
   "files": [
     "dist/*.js",

packages/map-template/src/components/LegendDialog/LegendDialog.scss

@@ -49,7 +49,6 @@
     &__section {
         display: grid;
         gap: var(--spacing-medium);
-        word-break: break-all;
     }
 
     &__sections {
@@ -78,6 +77,8 @@
 
     &__content {
         padding-bottom: var(--spacing-medium);
+        word-break: normal; // Prevents words from breaking in half
+        overflow-wrap: break-word; // Ensures long words break and move to the next line
     }
 
     .scroll-buttons {

packages/map-template/src/components/Search/Search.jsx

@@ -30,6 +30,7 @@ import { ReactComponent as Legend } from '../../assets/legend.svg';
 import isLegendDialogVisibleState from '../../atoms/isLegendDialogVisibleState';
 import legendSortedFieldsSelector from '../../selectors/legendSortedFieldsSelector';
 import searchAllVenuesState from '../../atoms/searchAllVenues';
+import isNullOrUndefined from '../../helpers/isNullOrUndefined';
 
 /**
  * Show the search results.
@@ -99,7 +100,7 @@ function Search({ onSetSize, isOpen }) {
     const searchAllVenues = useRecoilValue(searchAllVenuesState);
 
     /**
-     * 
+     *
      * Get the locations and filter through them based on categories selected.
      *
      * @param {string} category
@@ -145,8 +146,8 @@ function Search({ onSetSize, isOpen }) {
 
         setFilteredLocations([]);
 
-        // If keyboard is not null, clear the input field
-        if (keyboardRef.current !== null) {
+        // If keyboard is not null or undefined, clear the input field
+        if (!isNullOrUndefined(keyboardRef.current)) {
             keyboardRef.current.clearInputField();
         }
     }
@@ -331,7 +332,7 @@ function Search({ onSetSize, isOpen }) {
     }, [useKeyboard]);
 
     /*
-     * React on changes in the selected category state. 
+     * React on changes in the selected category state.
      * If the selected category is present, get the filtered locations based on the selected category.
      */
     useEffect(() => {
@@ -341,7 +342,7 @@ function Search({ onSetSize, isOpen }) {
     }, [selectedCategory]);
 
     /*
-     * Get the legend sections and determine 
+     * Get the legend sections and determine
      * If the legend button should be shown.
      */
     useEffect(() => {

packages/map-template/src/helpers/isNullOrUndefined.js

@@ -0,0 +1,9 @@
+/**
+ * Checks if the passed value is null or undefined.
+ *
+ * @param {any} value
+ * @returns {boolean}
+ */
+export default function isNullOrUndefined(value) {
+    return value === null || value === undefined;
+}