@plusscommunities/pluss-core-web 1.4.25 → 1.4.27

package/dist/index.cjs.js

@@ -1126,21 +1126,38 @@ var getDateFromTimeDatePickers = function getDateFromTimeDatePickers(dateInput,
   dateObject.setMinutes(time.minutes);
   return dateObject;
 };
-var minutesToString = function minutesToString(minutes) {
+var formatTime = function formatTime(hours, minutes) {
+  var period = hours >= 12 ? 'pm' : 'am'; // Convert 24-hour format to 12-hour format
+
+  var adjustedHours = hours > 12 ? hours - 12 : hours === 0 ? 12 : hours; // Ensure minutes are two digits
+
+  var adjustedMinutes = String(minutes).padStart(2, '0');
+  return "".concat(adjustedHours, ":").concat(adjustedMinutes).concat(period);
+};
+var minutesToString = function minutesToString(minutes, isTimeOfDay) {
   var hours = Math.floor(minutes / 60);
   var remainingMinutes = minutes % 60;
+
+  if (isTimeOfDay) {
+    return formatTime(hours, remainingMinutes);
+  }
+
   var hoursString = hours > 1 ? "".concat(hours, " hours") : "".concat(hours, " hour");
   var minutesString = remainingMinutes > 1 ? "".concat(remainingMinutes, " minutes") : "".concat(remainingMinutes, " minute");
 
   if (hours && remainingMinutes) {
     return "".concat(hoursString, " ").concat(minutesString);
-  } else if (hours) {
+  }
+
+  if (hours) {
     return hoursString;
-  } else if (remainingMinutes) {
+  }
+
+  if (remainingMinutes) {
     return minutesString;
-  } else {
-    return '0 minutes';
   }
+
+  return '0 minutes';
 };
 var getUTCFromTimeDatePickers = function getUTCFromTimeDatePickers(dateInput, timeInput) {
   var dateObject = getDateFromTimeDatePickers(dateInput, timeInput);
@@ -1804,6 +1821,7 @@ var index$3 = /*#__PURE__*/Object.freeze({
   hasTimeframeOverlap: hasTimeframeOverlap,
   timepickerToMinutes: timepickerToMinutes,
   getDateFromTimeDatePickers: getDateFromTimeDatePickers,
+  formatTime: formatTime,
   minutesToString: minutesToString,
   getUTCFromTimeDatePickers: getUTCFromTimeDatePickers,
   getPluralS: getPluralS,
@@ -6266,18 +6284,21 @@ var SideNavItem = /*#__PURE__*/function (_Component) {
       if (this.props.isFontAwesome) {
         content = /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
           className: "sideNav-item-icon",
-          name: this.props.Icon
+          name: this.props.Icon,
+          style: this.props.iconStyle
         });
       } else if (this.props.isSVG) {
         content = /*#__PURE__*/React__default['default'].createElement(SVGIcon, {
           className: "sideNav-item-icon",
           icon: this.props.Icon,
-          colour: COLOUR_DUSK_LIGHTER
+          colour: COLOUR_DUSK_LIGHTER,
+          style: this.props.iconStyle
         });
       } else {
         content = /*#__PURE__*/React__default['default'].createElement(P60Icon, {
           className: "sideNav-item-icon",
-          icon: this.props.Icon
+          icon: this.props.Icon,
+          style: this.props.iconStyle
         });
       }
 

package/dist/index.esm.js

@@ -1096,21 +1096,38 @@ var getDateFromTimeDatePickers = function getDateFromTimeDatePickers(dateInput,
   dateObject.setMinutes(time.minutes);
   return dateObject;
 };
-var minutesToString = function minutesToString(minutes) {
+var formatTime = function formatTime(hours, minutes) {
+  var period = hours >= 12 ? 'pm' : 'am'; // Convert 24-hour format to 12-hour format
+
+  var adjustedHours = hours > 12 ? hours - 12 : hours === 0 ? 12 : hours; // Ensure minutes are two digits
+
+  var adjustedMinutes = String(minutes).padStart(2, '0');
+  return "".concat(adjustedHours, ":").concat(adjustedMinutes).concat(period);
+};
+var minutesToString = function minutesToString(minutes, isTimeOfDay) {
   var hours = Math.floor(minutes / 60);
   var remainingMinutes = minutes % 60;
+
+  if (isTimeOfDay) {
+    return formatTime(hours, remainingMinutes);
+  }
+
   var hoursString = hours > 1 ? "".concat(hours, " hours") : "".concat(hours, " hour");
   var minutesString = remainingMinutes > 1 ? "".concat(remainingMinutes, " minutes") : "".concat(remainingMinutes, " minute");
 
   if (hours && remainingMinutes) {
     return "".concat(hoursString, " ").concat(minutesString);
-  } else if (hours) {
+  }
+
+  if (hours) {
     return hoursString;
-  } else if (remainingMinutes) {
+  }
+
+  if (remainingMinutes) {
     return minutesString;
-  } else {
-    return '0 minutes';
   }
+
+  return '0 minutes';
 };
 var getUTCFromTimeDatePickers = function getUTCFromTimeDatePickers(dateInput, timeInput) {
   var dateObject = getDateFromTimeDatePickers(dateInput, timeInput);
@@ -1774,6 +1791,7 @@ var index$3 = /*#__PURE__*/Object.freeze({
   hasTimeframeOverlap: hasTimeframeOverlap,
   timepickerToMinutes: timepickerToMinutes,
   getDateFromTimeDatePickers: getDateFromTimeDatePickers,
+  formatTime: formatTime,
   minutesToString: minutesToString,
   getUTCFromTimeDatePickers: getUTCFromTimeDatePickers,
   getPluralS: getPluralS,
@@ -6236,18 +6254,21 @@ var SideNavItem = /*#__PURE__*/function (_Component) {
       if (this.props.isFontAwesome) {
         content = /*#__PURE__*/React.createElement(FontAwesome, {
           className: "sideNav-item-icon",
-          name: this.props.Icon
+          name: this.props.Icon,
+          style: this.props.iconStyle
         });
       } else if (this.props.isSVG) {
         content = /*#__PURE__*/React.createElement(SVGIcon, {
           className: "sideNav-item-icon",
           icon: this.props.Icon,
-          colour: COLOUR_DUSK_LIGHTER
+          colour: COLOUR_DUSK_LIGHTER,
+          style: this.props.iconStyle
         });
       } else {
         content = /*#__PURE__*/React.createElement(P60Icon, {
           className: "sideNav-item-icon",
-          icon: this.props.Icon
+          icon: this.props.Icon,
+          style: this.props.iconStyle
         });
       }
 

package/dist/index.umd.js

@@ -1094,21 +1094,38 @@
     dateObject.setMinutes(time.minutes);
     return dateObject;
   };
-  var minutesToString = function minutesToString(minutes) {
+  var formatTime = function formatTime(hours, minutes) {
+    var period = hours >= 12 ? 'pm' : 'am'; // Convert 24-hour format to 12-hour format
+
+    var adjustedHours = hours > 12 ? hours - 12 : hours === 0 ? 12 : hours; // Ensure minutes are two digits
+
+    var adjustedMinutes = String(minutes).padStart(2, '0');
+    return "".concat(adjustedHours, ":").concat(adjustedMinutes).concat(period);
+  };
+  var minutesToString = function minutesToString(minutes, isTimeOfDay) {
     var hours = Math.floor(minutes / 60);
     var remainingMinutes = minutes % 60;
+
+    if (isTimeOfDay) {
+      return formatTime(hours, remainingMinutes);
+    }
+
     var hoursString = hours > 1 ? "".concat(hours, " hours") : "".concat(hours, " hour");
     var minutesString = remainingMinutes > 1 ? "".concat(remainingMinutes, " minutes") : "".concat(remainingMinutes, " minute");
 
     if (hours && remainingMinutes) {
       return "".concat(hoursString, " ").concat(minutesString);
-    } else if (hours) {
+    }
+
+    if (hours) {
       return hoursString;
-    } else if (remainingMinutes) {
+    }
+
+    if (remainingMinutes) {
       return minutesString;
-    } else {
-      return '0 minutes';
     }
+
+    return '0 minutes';
   };
   var getUTCFromTimeDatePickers = function getUTCFromTimeDatePickers(dateInput, timeInput) {
     var dateObject = getDateFromTimeDatePickers(dateInput, timeInput);
@@ -1772,6 +1789,7 @@
     hasTimeframeOverlap: hasTimeframeOverlap,
     timepickerToMinutes: timepickerToMinutes,
     getDateFromTimeDatePickers: getDateFromTimeDatePickers,
+    formatTime: formatTime,
     minutesToString: minutesToString,
     getUTCFromTimeDatePickers: getUTCFromTimeDatePickers,
     getPluralS: getPluralS,
@@ -6234,18 +6252,21 @@
         if (this.props.isFontAwesome) {
           content = /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
             className: "sideNav-item-icon",
-            name: this.props.Icon
+            name: this.props.Icon,
+            style: this.props.iconStyle
           });
         } else if (this.props.isSVG) {
           content = /*#__PURE__*/React__default['default'].createElement(SVGIcon, {
             className: "sideNav-item-icon",
             icon: this.props.Icon,
-            colour: COLOUR_DUSK_LIGHTER
+            colour: COLOUR_DUSK_LIGHTER,
+            style: this.props.iconStyle
           });
         } else {
           content = /*#__PURE__*/React__default['default'].createElement(P60Icon, {
             className: "sideNav-item-icon",
-            icon: this.props.Icon
+            icon: this.props.Icon,
+            style: this.props.iconStyle
           });
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-core-web",
-  "version": "1.4.25",
+  "version": "1.4.27",
   "description": "Core extension package for Pluss Communities platform",
   "main": "dist/index.cjs.js",
   "scripts": {

package/src/components/SideNavItem.js

@@ -49,11 +49,11 @@ class SideNavItem extends Component {
     }
     let content = null;
     if (this.props.isFontAwesome) {
-      content = <FontAwesome className="sideNav-item-icon" name={this.props.Icon} />;
+      content = <FontAwesome className="sideNav-item-icon" name={this.props.Icon} style={this.props.iconStyle} />;
     } else if (this.props.isSVG) {
-      content = <SVGIcon className="sideNav-item-icon" icon={this.props.Icon} colour={COLOUR_DUSK_LIGHTER} />;
+      content = <SVGIcon className="sideNav-item-icon" icon={this.props.Icon} colour={COLOUR_DUSK_LIGHTER} style={this.props.iconStyle} />;
     } else {
-      content = <P60Icon className="sideNav-item-icon" icon={this.props.Icon} />;
+      content = <P60Icon className="sideNav-item-icon" icon={this.props.Icon} style={this.props.iconStyle} />;
     }
     return <div style={{ ...styles.section, width: 18, marginRight: 16 }}>{content}</div>;
   }

package/src/helper/helper.js

@@ -134,22 +134,39 @@ export const getDateFromTimeDatePickers = (dateInput, timeInput) => {
   return dateObject;
 };
 
-export const minutesToString = (minutes) => {
-  let hours = Math.floor(minutes / 60);
-  let remainingMinutes = minutes % 60;
+export const formatTime = (hours, minutes) => {
+  const period = hours >= 12 ? 'pm' : 'am'; // Convert 24-hour format to 12-hour format
 
-  let hoursString = hours > 1 ? `${hours} hours` : `${hours} hour`;
-  let minutesString = remainingMinutes > 1 ? `${remainingMinutes} minutes` : `${remainingMinutes} minute`;
+  const adjustedHours = hours > 12 ? hours - 12 : hours === 0 ? 12 : hours; // Ensure minutes are two digits
+
+  const adjustedMinutes = String(minutes).padStart(2, '0');
+  return `${adjustedHours}:${adjustedMinutes}${period}`;
+};
+
+export const minutesToString = (minutes, isTimeOfDay) => {
+  const hours = Math.floor(minutes / 60);
+  const remainingMinutes = minutes % 60;
+
+  if (isTimeOfDay) {
+    return formatTime(hours, remainingMinutes);
+  }
+
+  const hoursString = hours > 1 ? `${hours} hours` : `${hours} hour`;
+  const minutesString = remainingMinutes > 1 ? `${remainingMinutes} minutes` : `${remainingMinutes} minute`;
 
   if (hours && remainingMinutes) {
     return `${hoursString} ${minutesString}`;
-  } else if (hours) {
+  }
+
+  if (hours) {
     return hoursString;
-  } else if (remainingMinutes) {
+  }
+
+  if (remainingMinutes) {
     return minutesString;
-  } else {
-    return '0 minutes';
   }
+
+  return '0 minutes';
 };
 
 export const getUTCFromTimeDatePickers = (dateInput, timeInput) => {