Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition
* develop: (141 commits) delint Doc some values Remove useless image reference Revert accidental renaming of dispatcherRef Fix event highlighthing Move some code around for clarity Constrain emoji skins type even further Delint i18n irc and fix lint from merge conflict Remove unwanted coma in EventTile fix three lints lint fix not sure how these happened :/ remove unused prop Update eslint-plugin-matrix-org Fix placeholder centering Make emoji skins type more specific Rename some variables since their purpose has changed Conform to new react and typescript eslint rules Apply code review suggestions ...
This commit is contained in:
commit
44b8bace47
317 changed files with 4473 additions and 2961 deletions
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
|||
limitations under the License.
|
||||
*/
|
||||
|
||||
import { JSXElementConstructor } from "react";
|
||||
import React, { JSXElementConstructor } from "react";
|
||||
|
||||
// Based on https://stackoverflow.com/a/53229857/3532235
|
||||
export type Without<T, U> = {[P in Exclude<keyof T, keyof U>]?: never};
|
||||
|
@ -22,3 +22,4 @@ export type XOR<T, U> = (T | U) extends object ? (Without<T, U> & U) | (Without<
|
|||
export type Writeable<T> = { -readonly [P in keyof T]: T[P] };
|
||||
|
||||
export type ComponentClass = keyof JSX.IntrinsicElements | JSXElementConstructor<any>;
|
||||
export type ReactAnyComponent = React.Component | React.ExoticComponent;
|
||||
|
|
4
src/@types/global.d.ts
vendored
4
src/@types/global.d.ts
vendored
|
@ -50,6 +50,8 @@ import UIStore from "../stores/UIStore";
|
|||
import { SetupEncryptionStore } from "../stores/SetupEncryptionStore";
|
||||
import { RoomScrollStateStore } from "../stores/RoomScrollStateStore";
|
||||
|
||||
/* eslint-disable @typescript-eslint/naming-convention */
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
matrixChat: ReturnType<Renderer>;
|
||||
|
@ -202,3 +204,5 @@ declare global {
|
|||
isReady: () => boolean;
|
||||
};
|
||||
}
|
||||
|
||||
/* eslint-enable @typescript-eslint/naming-convention */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue