OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3961 from matrix-org/travis/legacy-decorators 

Switch back to legacy decorators
pull/21833/head
Travis Ralston 2020-01-28 16:54:13 +00:00 committed by GitHub
parent cf2538fbed 330b489fd5
commit dc1405c3b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
babel.config.js
View File

@ -11,7 +11,7 @@ module.exports = {
"@babel/preset-react"
],
"plugins": [
["@babel/plugin-proposal-decorators", {decoratorsBeforeExport: true}],
["@babel/plugin-proposal-decorators", {legacy: true}],
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-proposal-numeric-separator",
"@babel/plugin-proposal-class-properties",

8
src/utils/replaceableComponent.ts
View File

@ -32,13 +32,9 @@ import * as sdk from '../index';
* with a skinned version. If no skinned version is available, this component
* will be used.
*/
export function replaceableComponent<T extends{new(...args: any[])}>(name: string) {
export function replaceableComponent(name: string, origComponent: React.Component) {
// Decorators return a function to override the class (origComponent). This
// ultimately assumes that `getComponent()` won't throw an error and instead
// return a falsey value like `null` when the skin doesn't have a component.
return (origComponent) => {
const c = sdk.getComponent(name) || origComponent;
c.kind = "class"; // appeases babel
return c;
};
return () => sdk.getComponent(name) || origComponent;
}