Skip to content

Commit

Permalink
Merge pull request #317 from Enterwell/stage
Browse files Browse the repository at this point in the history
Stage
  • Loading branch information
AleksandarDev authored Jan 26, 2024
2 parents 89fcbff + 64f9e64 commit 16ffdba
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 124 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
changes-location: ./packages/${{ inputs.name }}/changes
path-to-project-file: ./packages/${{ inputs.name }}/package.json
- name: Commit changelog changes
uses: EndBug/[email protected].3
uses: EndBug/[email protected].4
with:
message: "[skip ci] [version-bump] Automated commit for version ${{ steps.version-bump.outputs.bumped-semantic-version }}"
- run: pnpm i --frozen-lockfile --filter=${{ inputs.name }}...
Expand Down
9 changes: 8 additions & 1 deletion apps/docs/components/ExampleSelectManageable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,14 @@ export function ExampleSelectManageable() {
</Stack>
)}
listEndDecorator={(
<Button startIcon={<Add />} fullWidth>
<Button
fullWidth
startIcon={<Add />}
onMouseDown={(event) => {
// Prevent input blur which triggers closing the Popper
event.preventDefault();
}}
>
Add
</Button>
)}
Expand Down
12 changes: 6 additions & 6 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
"@enterwell/react-ui": "workspace:*",
"@mdx-js/mdx": "3.0.0",
"@mdx-js/react": "3.0.0",
"@mui/icons-material": "5.15.5",
"@mui/lab": "5.0.0-alpha.161",
"@mui/material": "5.15.5",
"@mui/system": "5.15.5",
"@mui/x-data-grid-pro": "6.19.1",
"@mui/icons-material": "5.15.6",
"@mui/lab": "5.0.0-alpha.162",
"@mui/material": "5.15.6",
"@mui/system": "5.15.6",
"@mui/x-data-grid-pro": "6.19.2",
"@mui/x-date-pickers": "5.0.20",
"@mui/x-date-pickers-pro": "5.0.20",
"classix": "2.1.35",
"classix": "2.1.36",
"comment-parser": "1.4.1",
"next": "14.1.0",
"nextra": "2.13.2",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"turbo": "1.11.3",
"@turbo/gen": "1.11.3"
},
"packageManager": "[email protected].1",
"packageManager": "[email protected].3",
"name": "ui"
}
2 changes: 1 addition & 1 deletion packages/react-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"lint": "eslint ."
},
"devDependencies": {
"@microsoft/api-extractor": "7.39.1",
"@microsoft/api-extractor": "7.39.4",
"@types/node": "18.19.8",
"@types/react": "18.2.48",
"@types/react-dom": "18.2.18",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-mui-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"devDependencies": {
"@enterwell/react-hooks": "workspace:*",
"@enterwell/react-ui": "workspace:*",
"@microsoft/api-extractor": "7.39.1",
"@mui/material": "5.15.5",
"@mui/x-data-grid-pro": "6.19.1",
"@microsoft/api-extractor": "7.39.4",
"@mui/material": "5.15.6",
"@mui/x-data-grid-pro": "6.19.2",
"@types/node": "18.19.8",
"@types/react": "18.2.48",
"@types/react-dom": "18.2.18",
Expand Down
20 changes: 7 additions & 13 deletions packages/react-ui/Select/Select.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, useEffect, KeyboardEvent, SyntheticEvent, FocusEvent, ReactNode } from 'react';
import { Autocomplete, TextField, CircularProgress, ChipTypeMap, Popper, Paper } from '@mui/material';
import { Autocomplete, TextField, CircularProgress, ChipTypeMap, Paper } from '@mui/material';
import { type AutocompleteProps, createFilterOptions } from '@mui/material/Autocomplete';
import { useDebounce } from '@enterwell/react-hooks';

Expand Down Expand Up @@ -238,18 +238,12 @@ export function Select<
{displayOption ? displayOption(option) : option.label}
</li>
)}
PopperComponent={({ children, ...rest }) => (
<Popper {...rest} sx={{
'& .MuiAutocomplete-paper': {
boxShadow: 'none'
}
}}>
<Paper>
{listStartDecorator}
{typeof children === 'function' ? children({ placement: rest.placement ?? 'auto' }) : children}
{listEndDecorator}
</Paper>
</Popper>
PaperComponent={({ children, ...rest }) => (
<Paper {...rest}>
{listStartDecorator}
{children}
{listEndDecorator}
</Paper>
)}
filterOptions={customFilterOptions}
renderInput={(params) => (
Expand Down
Empty file.
8 changes: 4 additions & 4 deletions packages/react-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"@emotion/react": "11.11.3",
"@emotion/styled": "11.11.0",
"@enterwell/react-hooks": "workspace:*",
"@microsoft/api-extractor": "7.39.1",
"@mui/icons-material": "5.15.5",
"@mui/material": "5.15.5",
"@mui/system": "5.15.5",
"@microsoft/api-extractor": "7.39.4",
"@mui/icons-material": "5.15.6",
"@mui/material": "5.15.6",
"@mui/system": "5.15.6",
"@mui/x-date-pickers-pro": "5.0.20",
"@mui/x-date-pickers": "5.0.20",
"@types/node": "18.19.8",
Expand Down
Loading

0 comments on commit 16ffdba

Please sign in to comment.