Skip to content
This repository has been archived by the owner on Nov 28, 2024. It is now read-only.

fix: update chatbox with mention fix #178

Merged
merged 1 commit into from
Jan 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 29 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"version": "0.2.1",
"private": true,
"dependencies": {
"@emotion/react": "11.10.4",
"@emotion/styled": "11.10.4",
"@graasp/chatbox": "github:graasp/graasp-chatbox#v1",
"@graasp/query-client": "github:graasp/graasp-query-client",
"@emotion/react": "11.10.5",
"@emotion/styled": "11.10.5",
"@graasp/chatbox": "1.0.1",
"@graasp/query-client": "0.1.2",
"@graasp/sdk": "0.2.0",
"@graasp/ui": "0.7.1",
"@mui/icons-material": "5.10.9",
"@mui/lab": "5.0.0-alpha.107",
"@mui/material": "5.10.13",
"@sentry/react": "7.15.0",
"@sentry/tracing": "7.15.0",
"@mui/icons-material": "5.11.0",
"@mui/lab": "5.0.0-alpha.117",
"@mui/material": "5.11.6",
"@sentry/react": "7.33.0",
"@sentry/tracing": "7.33.0",
"clsx": "1.1.1",
"history": "5.2.0",
"http-status-codes": "2.2.0",
Expand All @@ -31,7 +31,7 @@
"react-query": "3.39.2",
"react-router": "6.2.1",
"react-router-dom": "6.2.1",
"react-scripts": "4.0.3",
"react-scripts": "5.0.1",
"react-toastify": "9.0.3",
"uuid": "9.0.0"
},
Expand Down Expand Up @@ -76,37 +76,36 @@
]
},
"devDependencies": {
"@babel/eslint-parser": "^7.16.5",
"@commitlint/cli": "16.0.1",
"@commitlint/config-conventional": "16.0.0",
"@commitlint/cli": "17.4.2",
"@commitlint/config-conventional": "17.4.2",
"@cypress/code-coverage": "3.10.0",
"@cypress/instrument-cra": "1.4.0",
"@graasp/websockets": "github:graasp/graasp-websockets",
"@testing-library/jest-dom": "5.16.1",
"@testing-library/react": "12.1.2",
"@testing-library/user-event": "13.5.0",
"@trivago/prettier-plugin-sort-imports": "3.3.1",
"@trivago/prettier-plugin-sort-imports": "4.0.0",
"@types/react": "^17.0.2",
"@types/react-dom": "^17.0.2",
"@typescript-eslint/eslint-plugin": "5.44.0",
"@typescript-eslint/parser": "5.44.0",
"concurrently": "7.4.0",
"cypress": "11.2.0",
"@typescript-eslint/eslint-plugin": "5.49.0",
"@typescript-eslint/parser": "5.49.0",
"concurrently": "7.6.0",
"cypress": "12.4.0",
"env-cmd": "10.1.0",
"eslint": "^7.32.0",
"eslint-config-airbnb": "18.2.1",
"eslint-config-prettier": "8.3.0",
"eslint-config-react-app": "^6.0.0",
"eslint-import-resolver-typescript": "3.5.1",
"eslint": "8.32.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-prettier": "8.6.0",
"eslint-config-react-app": "7.0.1",
"eslint-import-resolver-typescript": "3.5.3",
"eslint-plugin-flowtype": "8.0.3",
"eslint-plugin-import": "2.25.4",
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-react": "7.28.0",
"husky": "7.0.4",
"prettier": "2.7.1",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-react": "7.32.1",
"husky": "8.0.3",
"prettier": "2.8.3",
"standard-version": "9.5.0",
"typescript": "4.8.4",
"wait-on": "6.0.1"
"typescript": "4.9.4",
"wait-on": "7.0.1"
},
"nyc": {
"exclude": [
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/Item.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ const Item = ({

// render each children recursively
return (
<Container disableGutters>
<>
{!showPinnedOnly && (
<>
<Typography className={FOLDER_NAME_TITLE_CLASS} variant="h5">
Expand Down Expand Up @@ -243,7 +243,7 @@ const Item = ({
))}
</>
)}
</Container>
</>
);
}
case ITEM_TYPES.LINK: {
Expand Down
6 changes: 3 additions & 3 deletions src/components/common/SideContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useParams } from 'react-router';

import ForumIcon from '@mui/icons-material/Forum';
import PushPinIcon from '@mui/icons-material/PushPin';
import { Box, Grid, Tooltip, styled } from '@mui/material';
import { Grid, Stack, Tooltip, styled } from '@mui/material';
import IconButton from '@mui/material/IconButton';

import { DRAWER_WIDTH, FLOATING_BUTTON_Z_INDEX } from '../../config/constants';
Expand Down Expand Up @@ -161,11 +161,11 @@ const SideContent = ({ children, item }) => {
open={isPinnedMenuOpen}
>
{/* show parents pinned items */}
<Box overflow="auto" height="80vh" id={ITEM_PINNED_ID}>
<Stack id={ITEM_PINNED_ID} spacing={2} mt={1}>
{parentsIds.map((i) => (
<Item key={i} id={i} showPinnedOnly />
))}
</Box>
</Stack>
</SideDrawer>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Tree/CustomTreeShortcutItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import OpenInNewIcon from '@mui/icons-material/OpenInNew';
import TreeItem from '@mui/lab/TreeItem';
import TreeView from '@mui/lab/TreeView';

import { redirect } from '@graasp/utils';
import { redirect } from '@graasp/sdk';

import { buildGraaspPlayerItemRoute } from '../../../config/constants';
import { buildTreeShortcutItemClass } from '../../../config/selectors';
Expand Down
12 changes: 3 additions & 9 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"compilerOptions": {
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
Expand All @@ -20,8 +16,6 @@
"noEmit": true,
"jsx": "react-jsx"
},
"include": [
"src"
],
"exclude": ["cypress", "*.test.ts", "*.test.js"]
"include": ["src"],
"exclude": ["cypress", "*.test.ts", "*.test.js", "node_modules"]
}
Loading