Merge pull request #245 from hiroshisuga/dev5.0.0_prettyPollPR

Prettier poll result

package.json

@@ -4,6 +4,7 @@
   "homepage": "/playback/presentation/2.3",
   "dependencies": {
     "@tldraw/tldraw": "^2.0.0-alpha.18",
+    "bowser": "^2.11.0",
     "classnames": "^2.3.1",
     "darkreader": "^4.9.46",
     "linkify-react": "^3.0.4",

src/components/chat/messages/system/poll/index.scss

@@ -10,6 +10,10 @@
   padding-bottom: $padding-small;
 }
 
+.poll-pads {
+  visibility: hidden;
+}
+
 .poll-bar {
   color: var(--poll-bar-color);
 }

src/components/chat/messages/system/poll/result.js

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {
   getBar,
+  getPads,
   getPercentage,
 } from 'utils/data';
 import { isEmpty } from 'utils/data/validators';
@@ -17,12 +18,17 @@ const defaultProps = {
   responders: 0,
 };
 
+const getDigits = (n) => { return n.toString().length; };
+
 const Result = ({
   answers,
   responders,
 }) => {
   if (isEmpty(answers)) return null;
 
+  const answersDigits = getDigits(answers.length);
+  const maxVotes = Math.max(...answers.map((item) => { return item.numVotes; }));
+  const maxVotesDigits = getDigits(maxVotes);
   return (
     <div className="poll-result">
       {answers.map((item) => {
@@ -35,7 +41,15 @@ const Result = ({
 
         return(
           <div className="poll-label">
-            {id + 1}: {numVotes} <span className="poll-bar">{getBar(percentage)}</span> {percentage}%
+            {id + 1}
+            <span className="poll-pads">
+              {getPads(answersDigits - getDigits(id+1))}
+            </span>
+            : {numVotes}
+            <span className="poll-pads">
+              {getPads(maxVotesDigits - getDigits(numVotes)) + ' '}
+            </span>
+            <span className="poll-bar">{getBar(percentage)}</span> {percentage}%
           </div>
         );
       })}

src/utils/browserInfo.js

@@ -0,0 +1,29 @@
+import Bowser from 'bowser';
+
+const BOWSER_RESULTS = Bowser.parse(window.navigator.userAgent);
+
+const isChrome = BOWSER_RESULTS.browser.name === 'Chrome';
+const isSafari = BOWSER_RESULTS.browser.name === 'Safari';
+const isEdge = BOWSER_RESULTS.browser.name === 'Microsoft Edge';
+const isIe = BOWSER_RESULTS.browser.name === 'Internet Explorer';
+const isFirefox = BOWSER_RESULTS.browser.name === 'Firefox';
+
+const browserName = BOWSER_RESULTS.browser.name;
+const versionNumber = BOWSER_RESULTS.browser.version;
+
+const isValidSafariVersion = Bowser.getParser(window.navigator.userAgent).satisfies({
+  safari: '>12',
+});
+
+const browserInfo = {
+  isChrome,
+  isSafari,
+  isEdge,
+  isIe,
+  isFirefox,
+  browserName,
+  versionNumber,
+  isValidSafariVersion,
+};
+
+export default browserInfo;

src/utils/data/index.js

@@ -15,6 +15,8 @@ import {
 } from 'utils/data/validators';
 import hash from 'utils/hash';
 import { getMediaPath } from 'utils/params';
+import browserInfo from 'utils/browserInfo';
+import deviceInfo from 'utils/deviceInfo';
 
 const buildFileURL = (file, recordId = null) => {
   if (!ROUTER) return file;
@@ -40,6 +42,8 @@ const FULL_BLOCK = '█';
 const LEFT_HALF_BLOCK = '▌';
 const RIGHT_HALF_BLOCK = '▐';
 const EMPTY_BLOCK = '-';
+const FIGURE_SPACE = ' ';
+const EN_SPACE = ' '
 
 const getBar = (percentage) => {
   const p = parseInt(percentage);
@@ -63,6 +67,22 @@ const getBar = (percentage) => {
   return bar;
 };
 
+const getPads = (n) => {
+  if (deviceInfo.osName === "Linux") {
+    // Note the conditional branch below could be the other way around
+    //  i.e. FIGURE_SPACE for Firefox and EN_SPACE for Chrome
+    //  depending on locale.
+    // See https://github.com/bigbluebutton/bbb-playback/pull/245 .
+    if (browserInfo.isChrome) {
+      return EN_SPACE.repeat(n);
+    } else if (browserInfo.isFirefox) {
+      return FIGURE_SPACE.repeat(n);
+    }
+  } else {
+    return FULL_BLOCK.repeat(n);
+  }
+}
+
 const getCurrentContent = (time) => {
   const {
     SCREENSHARE,
@@ -180,6 +200,7 @@ export {
   buildFileURL,
   getAvatarStyle,
   getBar,
+  getPads,
   getCurrentContent,
   getCurrentDataIndex,
   getCurrentDataInterval,

src/utils/deviceInfo.js

@@ -0,0 +1,34 @@
+import Bowser from 'bowser';
+
+const BOWSER_RESULTS = Bowser.parse(window.navigator.userAgent);
+
+const isPhone = BOWSER_RESULTS.platform.type === 'mobile';
+// we need a 'hack' to correctly detect ipads with ios > 13
+const isTablet = BOWSER_RESULTS.platform.type === 'tablet' || (BOWSER_RESULTS.os.name === 'macOS' && window.navigator.maxTouchPoints > 0);
+const isMobile = isPhone || isTablet;
+const hasMediaDevices = !!navigator.mediaDevices;
+const osName = BOWSER_RESULTS.os.name;
+const osVersion = BOWSER_RESULTS.os.version;
+const isIos = osName === 'iOS';
+const isMacos = osName === 'macOS';
+const isIphone = !!(window.navigator.userAgent.match(/iPhone/i));
+
+const SUPPORTED_IOS_VERSION = 12.2;
+const isIosVersionSupported = () => parseFloat(osVersion) >= SUPPORTED_IOS_VERSION;
+
+const isPortrait = () => window.innerHeight > window.innerWidth;
+
+const deviceInfo = {
+  isTablet,
+  isPhone,
+  isMobile,
+  hasMediaDevices,
+  osName,
+  isPortrait,
+  isIos,
+  isMacos,
+  isIphone,
+  isIosVersionSupported,
+};
+
+export default deviceInfo;