@matrix-widget-toolkit/mui 1.1.0 → 1.1.2

package/build/cjs/index.js

@@ -2,13 +2,13 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var material = require('@mui/material');
+var react$2 = require('react');
 require('@fontsource/inter/400.css');
 require('@fontsource/inter/600.css');
 var react$1 = require('@matrix-widget-toolkit/react');
 var locale = require('@mui/material/locale');
 var utils = require('@mui/utils');
 var i18n = require('i18next');
-var react$2 = require('react');
 var createCache = require('@emotion/cache');
 var react = require('@emotion/react');
 var lodash = require('lodash');
@@ -681,10 +681,11 @@ function ElementMuiThemeProvider(_a) {
  */
 function createAvatarUrl(url, _a) {
     var _b = _a === void 0 ? {} : _a, _c = _b.size, size = _c === void 0 ? 60 : _c;
-    var mxcUrl = new URL(url);
-    if (mxcUrl.protocol.toLowerCase() !== 'mxc:') {
+    var mxcPrefix = 'mxc://';
+    if (url.indexOf(mxcPrefix) !== 0) {
         return url;
     }
+    var mxcUrl = url.slice(mxcPrefix.length);
     // TODO: Instead of retrieving the home server from an env variable, it would
     // be good to get this passed by the widget host, e.g. as an URL parameter.
     // In general our tight CSP makes it difficult to load images from this
@@ -693,7 +694,7 @@ function createAvatarUrl(url, _a) {
     // current users id and resolving the home server URL from the well-known
     // endpoint. However, this would also require a broad connect-src in the CSP.
     var homeServer = getEnvironment('REACT_APP_HOME_SERVER_URL', 'https://matrix-client.matrix.org');
-    var imageUrl = new URL("/_matrix/media/r0/thumbnail/".concat(mxcUrl.hostname).concat(mxcUrl.pathname, "?width=").concat(size, "&height=").concat(size, "&method=crop"), homeServer);
+    var imageUrl = new URL("/_matrix/media/r0/thumbnail/".concat(mxcUrl, "?width=").concat(size, "&height=").concat(size, "&method=crop"), homeServer);
     return imageUrl.toString();
 }
 
@@ -764,6 +765,17 @@ var __assign$9 = (undefined && undefined.__assign) || function () {
     };
     return __assign$9.apply(this, arguments);
 };
+var __rest = (undefined && undefined.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var StyledAvatar = material.styled(material.Avatar, {
     shouldForwardProp: function (p) { return p !== 'color'; },
 })(function (_a) {
@@ -784,12 +796,12 @@ var StyledAvatar = material.styled(material.Avatar, {
  * A component to display user and room avatars in the style of Element.
  * @param param0 - {@link ElementAvatarProps}
  */
-function ElementAvatar(_a) {
-    var avatarUrl = _a.avatarUrl, userId = _a.userId, displayName = _a.displayName, sx = _a.sx;
+var ElementAvatar = react$2.forwardRef(function ElementAvatar(_a, ref) {
+    var avatarUrl = _a.avatarUrl, userId = _a.userId, displayName = _a.displayName, props = __rest(_a, ["avatarUrl", "userId", "displayName"]);
     var src = avatarUrl ? createAvatarUrl(avatarUrl) : undefined;
     var name = displayName !== null && displayName !== void 0 ? displayName : userId;
-    return (jsxRuntime.jsx(StyledAvatar, __assign$9({ alt: "", "aria-hidden": true, src: src, color: getColor(userId), sx: sx }, { children: getInitialLetter(name) })));
-}
+    return (jsxRuntime.jsx(StyledAvatar, __assign$9({ ref: ref, alt: "", "aria-hidden": true, src: src, color: getColor(userId) }, props, { children: getInitialLetter(name) })));
+});
 
 var __assign$8 = (undefined && undefined.__assign) || function () {
     __assign$8 = Object.assign || function(t) {

package/build/esm/index.js

@@ -1,12 +1,12 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { createTheme, ThemeProvider, CssBaseline, styled, Avatar, Box, CircularProgress, Typography, Alert, AlertTitle, Button, Paper, IconButton, Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions } from '@mui/material';
+import { useState, useEffect, useMemo, forwardRef, useCallback } from 'react';
 import '@fontsource/inter/400.css';
 import '@fontsource/inter/600.css';
 import { ThemeSelectionProvider, useThemeSelection, CapabilitiesGuard, useWidgetApi, WidgetApiProvider } from '@matrix-widget-toolkit/react';
 import { deDE, enUS } from '@mui/material/locale';
 import { deepmerge, unstable_useId } from '@mui/utils';
 import i18n from 'i18next';
-import { useState, useEffect, useMemo, useCallback } from 'react';
 import createCache from '@emotion/cache';
 import { CacheProvider } from '@emotion/react';
 import { split } from 'lodash';
@@ -669,10 +669,11 @@ function ElementMuiThemeProvider(_a) {
  */
 function createAvatarUrl(url, _a) {
     var _b = _a === void 0 ? {} : _a, _c = _b.size, size = _c === void 0 ? 60 : _c;
-    var mxcUrl = new URL(url);
-    if (mxcUrl.protocol.toLowerCase() !== 'mxc:') {
+    var mxcPrefix = 'mxc://';
+    if (url.indexOf(mxcPrefix) !== 0) {
         return url;
     }
+    var mxcUrl = url.slice(mxcPrefix.length);
     // TODO: Instead of retrieving the home server from an env variable, it would
     // be good to get this passed by the widget host, e.g. as an URL parameter.
     // In general our tight CSP makes it difficult to load images from this
@@ -681,7 +682,7 @@ function createAvatarUrl(url, _a) {
     // current users id and resolving the home server URL from the well-known
     // endpoint. However, this would also require a broad connect-src in the CSP.
     var homeServer = getEnvironment('REACT_APP_HOME_SERVER_URL', 'https://matrix-client.matrix.org');
-    var imageUrl = new URL("/_matrix/media/r0/thumbnail/".concat(mxcUrl.hostname).concat(mxcUrl.pathname, "?width=").concat(size, "&height=").concat(size, "&method=crop"), homeServer);
+    var imageUrl = new URL("/_matrix/media/r0/thumbnail/".concat(mxcUrl, "?width=").concat(size, "&height=").concat(size, "&method=crop"), homeServer);
     return imageUrl.toString();
 }
 
@@ -752,6 +753,17 @@ var __assign$9 = (undefined && undefined.__assign) || function () {
     };
     return __assign$9.apply(this, arguments);
 };
+var __rest = (undefined && undefined.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var StyledAvatar = styled(Avatar, {
     shouldForwardProp: function (p) { return p !== 'color'; },
 })(function (_a) {
@@ -772,12 +784,12 @@ var StyledAvatar = styled(Avatar, {
  * A component to display user and room avatars in the style of Element.
  * @param param0 - {@link ElementAvatarProps}
  */
-function ElementAvatar(_a) {
-    var avatarUrl = _a.avatarUrl, userId = _a.userId, displayName = _a.displayName, sx = _a.sx;
+var ElementAvatar = forwardRef(function ElementAvatar(_a, ref) {
+    var avatarUrl = _a.avatarUrl, userId = _a.userId, displayName = _a.displayName, props = __rest(_a, ["avatarUrl", "userId", "displayName"]);
     var src = avatarUrl ? createAvatarUrl(avatarUrl) : undefined;
     var name = displayName !== null && displayName !== void 0 ? displayName : userId;
-    return (jsx(StyledAvatar, __assign$9({ alt: "", "aria-hidden": true, src: src, color: getColor(userId), sx: sx }, { children: getInitialLetter(name) })));
-}
+    return (jsx(StyledAvatar, __assign$9({ ref: ref, alt: "", "aria-hidden": true, src: src, color: getColor(userId) }, props, { children: getInitialLetter(name) })));
+});
 
 var __assign$8 = (undefined && undefined.__assign) || function () {
     __assign$8 = Object.assign || function(t) {

package/build/index.d.ts

@@ -5,13 +5,15 @@
 
 /// <reference types="react" />
 
+import { AvatarProps } from '@mui/material';
 import { BackendModule } from 'i18next';
 import { Capability } from 'matrix-widget-api';
+import { CommonProps } from '@mui/material/OverridableComponent';
+import { ForwardRefExoticComponent } from 'react';
 import LanguageDetector from 'i18next-browser-languagedetector';
 import { PropsWithChildren } from 'react';
 import { ReactElement } from 'react';
-import { SxProps } from '@mui/material';
-import { Theme } from '@mui/material';
+import { RefAttributes } from 'react';
 import { WidgetApi } from '@matrix-widget-toolkit/api';
 import { WidgetEventCapability } from 'matrix-widget-api';
 import { WidgetRegistration } from '@matrix-widget-toolkit/api';
@@ -20,7 +22,7 @@ import { WidgetRegistration } from '@matrix-widget-toolkit/api';
  * A component to display user and room avatars in the style of Element.
  * @param param0 - {@link ElementAvatarProps}
  */
-export declare function ElementAvatar({ avatarUrl, userId, displayName, sx, }: ElementAvatarProps): JSX.Element;
+export declare const ElementAvatar: ForwardRefExoticComponent<Pick<ElementAvatarProps, "id" | "userId" | "displayName" | "avatarUrl" | "title" | "children" | "slot" | "onReset" | "onError" | "color" | "translate" | keyof CommonProps | "sx" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "variant" | "alt" | "imgProps" | "sizes" | "src" | "srcSet"> & RefAttributes<HTMLDivElement>>;
 
 /**
  * Props for the {@link ElementAvatar} component.
@@ -42,9 +44,7 @@ export declare type ElementAvatarProps = {
      * If not provided, the initial letter based on the display name or userId is used instead.
      */
     avatarUrl?: string;
-    /** Additional styling for the avatar */
-    sx?: SxProps<Theme>;
-};
+} & AvatarProps;
 
 /**
  * Reads environment variables starting with `REACT_APP_` from a global variable

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matrix-widget-toolkit/mui",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "A customized material-ui theme that matches the style of the Element Matrix client",
   "author": "Nordeck IT + Consulting GmbH",
   "license": "Apache-2.0",
@@ -18,7 +18,7 @@
     "@types/node": "^16.18.14",
     "@types/react": "^17.0.45",
     "copyfiles": "^2.4.1",
-    "i18next-parser": "^7.6.0",
+    "i18next-parser": "^7.7.0",
     "jest-axe": "^7.0.0",
     "react": "^17.0.2",
     "react-scripts": "5.0.1",