matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into schema-improvements

Browse Source
This commit is contained in:
Alex Gleason
2023-06-13 20:58:49 -05:00
parent 263db3e1f0 85261fc415
commit 405dcef4a5
6 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/soapbox/components/list.tsx
View File

@ -43,6 +43,7 @@ const ListItem: React.FC<IListItem> = ({ label, hint, children, onClick, onSelec
const isSelect = child.type === SelectDropdown || child.type === Select;
return React.cloneElement(child, {
// @ts-ignore
id: domId,
className: clsx({
'w-auto': isSelect,

3
app/soapbox/components/ui/form-group/form-group.tsx
View File

@ -29,9 +29,12 @@ const FormGroup: React.FC<IFormGroup> = (props) => {
if (React.isValidElement(inputChildren[0])) {
firstChild = React.cloneElement(
inputChildren[0],
// @ts-ignore
{ id: formFieldId },
);
}
// @ts-ignore
const isCheckboxFormGroup = firstChild?.type === Checkbox;
if (isCheckboxFormGroup) {

7
app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
View File

@ -1,6 +1,7 @@
import { AxiosError } from 'axios';
import React, { useMemo, useState } from 'react';
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
import { z } from 'zod';
import { useCreateGroup, useGroupValidation, type CreateGroupParams } from 'soapbox/api/hooks';
import { Modal, Stack } from 'soapbox/components/ui';
@ -71,9 +72,9 @@ const CreateGroupModal: React.FC<ICreateGroupModal> = ({ onClose }) => {
},
onError(error) {
if (error instanceof AxiosError) {
const msg = error.response?.data.error;
if (typeof msg === 'string') {
toast.error(msg);
const msg = z.object({ error: z.string() }).safeParse(error.response?.data);
if (msg.success) {
toast.error(msg.data.error);
}
}
},

24
app/soapbox/features/ui/util/fullscreen.ts
View File

@ -33,26 +33,4 @@ export const requestFullscreen = (el: Element): void => {
// @ts-ignore
el.mozRequestFullScreen();
}
};
type FullscreenListener = (this: Document, ev: Event) => void;
export const attachFullscreenListener = (listener: FullscreenListener): void => {
if ('onfullscreenchange' in document) {
document.addEventListener('fullscreenchange', listener);
} else if ('onwebkitfullscreenchange' in document) {
document.addEventListener('webkitfullscreenchange', listener);
} else if ('onmozfullscreenchange' in document) {
document.addEventListener('mozfullscreenchange', listener);
}
};
export const detachFullscreenListener = (listener: FullscreenListener): void => {
if ('onfullscreenchange' in document) {
document.removeEventListener('fullscreenchange', listener);
} else if ('onwebkitfullscreenchange' in document) {
document.removeEventListener('webkitfullscreenchange', listener);
} else if ('onmozfullscreenchange' in document) {
document.removeEventListener('mozfullscreenchange', listener);
}
};
};