Skip to content

Commit

Permalink
feat(sharing): Upgrade cozy-ui and cozy-client
Browse files Browse the repository at this point in the history
  • Loading branch information
JF-Cozy authored and cballevre committed Feb 29, 2024
1 parent 4f5a6b2 commit f09507c
Show file tree
Hide file tree
Showing 8 changed files with 158 additions and 118 deletions.
8 changes: 4 additions & 4 deletions packages/cozy-sharing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"babel-jest": "26.6.3",
"babel-plugin-css-modules-transform": "1.6.2",
"babel-plugin-inline-react-svg": "1.1.2",
"cozy-client": "40.5.0",
"cozy-ui": "93.1.1",
"cozy-client": "^45.14.0",
"cozy-ui": "^103.8.2",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
"enzyme-to-json": "3.6.2",
Expand All @@ -50,9 +50,9 @@
"react-router": "^5.0.1"
},
"peerDependencies": {
"cozy-client": "^40.5.0",
"cozy-client": ">=45.14.0",
"cozy-realtime": "^3.11.0",
"cozy-ui": ">=93.1.1",
"cozy-ui": ">=103.8.1",
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react-router": "^5.0.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const SharingBannerByLinkText = () => {
</a>
)
return (
<span style={{ color: 'var(--textIconColor)' }}>
<span style={{ color: 'var(--iconTextColor)' }}>
{text} {knowMore}
</span>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,46 +132,51 @@ exports[`ContactSuggestion component should display contact suggestion for a con
<ListItemIcon
key=".$.$.0"
>
<ForwardRef(ListItemIcon)
classes={
Object {
"alignItemsFlexStart": "MuiListItemIcon-alignItemsFlexStart",
"root": "MuiListItemIcon-root",
}
}
<WithStyles(ForwardRef(ListItemIcon))
className="cozyListItemIcon"
>
<div
className="MuiListItemIcon-root"
<ForwardRef(ListItemIcon)
className="cozyListItemIcon"
classes={
Object {
"alignItemsFlexStart": "MuiListItemIcon-alignItemsFlexStart",
"root": "MuiListItemIcon-root",
}
}
>
<Avatar
className=""
disabled={false}
ghost={false}
icon={[Function]}
image=""
size="small"
style={Object {}}
text="JS"
<div
className="MuiListItemIcon-root cozyListItemIcon"
>
<div
className="styles__c-avatar___PpDI- styles__c-avatar--text___2dvna"
data-testid="Avatar"
style={
Object {
"--circleSize": "32px",
"backgroundColor": "#C2ADF4",
}
}
<Avatar
className=""
disabled={false}
ghost={false}
icon={[Function]}
image=""
size="small"
style={Object {}}
text="JS"
>
<span
className="styles__c-avatar-initials___310qC"
<div
className="styles__c-avatar___PpDI- styles__c-avatar--text___2dvna"
data-testid="Avatar"
style={
Object {
"--circleSize": "32px",
"backgroundColor": "#C2ADF4",
}
}
>
JS
</span>
</div>
</Avatar>
</div>
</ForwardRef(ListItemIcon)>
<span
className="styles__c-avatar-initials___310qC"
>
JS
</span>
</div>
</Avatar>
</div>
</ForwardRef(ListItemIcon)>
</WithStyles(ForwardRef(ListItemIcon))>
</ListItemIcon>
<ListItemText
ellipsis={true}
Expand Down Expand Up @@ -501,46 +506,51 @@ exports[`ContactSuggestion component should display contact suggestion for a con
<ListItemIcon
key=".$.$.0"
>
<ForwardRef(ListItemIcon)
classes={
Object {
"alignItemsFlexStart": "MuiListItemIcon-alignItemsFlexStart",
"root": "MuiListItemIcon-root",
}
}
<WithStyles(ForwardRef(ListItemIcon))
className="cozyListItemIcon"
>
<div
className="MuiListItemIcon-root"
<ForwardRef(ListItemIcon)
className="cozyListItemIcon"
classes={
Object {
"alignItemsFlexStart": "MuiListItemIcon-alignItemsFlexStart",
"root": "MuiListItemIcon-root",
}
}
>
<Avatar
className=""
disabled={false}
ghost={false}
icon={[Function]}
image=""
size="small"
style={Object {}}
text="J"
<div
className="MuiListItemIcon-root cozyListItemIcon"
>
<div
className="styles__c-avatar___PpDI- styles__c-avatar--text___2dvna"
data-testid="Avatar"
style={
Object {
"--circleSize": "32px",
"backgroundColor": "#0DCBCF",
}
}
<Avatar
className=""
disabled={false}
ghost={false}
icon={[Function]}
image=""
size="small"
style={Object {}}
text="J"
>
<span
className="styles__c-avatar-initials___310qC"
<div
className="styles__c-avatar___PpDI- styles__c-avatar--text___2dvna"
data-testid="Avatar"
style={
Object {
"--circleSize": "32px",
"backgroundColor": "#0DCBCF",
}
}
>
J
</span>
</div>
</Avatar>
</div>
</ForwardRef(ListItemIcon)>
<span
className="styles__c-avatar-initials___310qC"
>
J
</span>
</div>
</Avatar>
</div>
</ForwardRef(ListItemIcon)>
</WithStyles(ForwardRef(ListItemIcon))>
</ListItemIcon>
<ListItemText
ellipsis={true}
Expand Down Expand Up @@ -921,46 +931,51 @@ exports[`ContactSuggestion component should display contact suggestion for a gro
<ListItemIcon
key=".$.$.0"
>
<ForwardRef(ListItemIcon)
classes={
Object {
"alignItemsFlexStart": "MuiListItemIcon-alignItemsFlexStart",
"root": "MuiListItemIcon-root",
}
}
<WithStyles(ForwardRef(ListItemIcon))
className="cozyListItemIcon"
>
<div
className="MuiListItemIcon-root"
<ForwardRef(ListItemIcon)
className="cozyListItemIcon"
classes={
Object {
"alignItemsFlexStart": "MuiListItemIcon-alignItemsFlexStart",
"root": "MuiListItemIcon-root",
}
}
>
<Avatar
className=""
disabled={false}
ghost={false}
icon={[Function]}
image=""
size="small"
style={Object {}}
text="G"
<div
className="MuiListItemIcon-root cozyListItemIcon"
>
<div
className="styles__c-avatar___PpDI- styles__c-avatar--text___2dvna"
data-testid="Avatar"
style={
Object {
"--circleSize": "32px",
"backgroundColor": "#7F6BEE",
}
}
<Avatar
className=""
disabled={false}
ghost={false}
icon={[Function]}
image=""
size="small"
style={Object {}}
text="G"
>
<span
className="styles__c-avatar-initials___310qC"
<div
className="styles__c-avatar___PpDI- styles__c-avatar--text___2dvna"
data-testid="Avatar"
style={
Object {
"--circleSize": "32px",
"backgroundColor": "#7F6BEE",
}
}
>
G
</span>
</div>
</Avatar>
</div>
</ForwardRef(ListItemIcon)>
<span
className="styles__c-avatar-initials___310qC"
>
G
</span>
</div>
</Avatar>
</div>
</ForwardRef(ListItemIcon)>
</WithStyles(ForwardRef(ListItemIcon))>
</ListItemIcon>
<ListItemText
ellipsis={true}
Expand Down
2 changes: 0 additions & 2 deletions packages/cozy-sharing/src/styles/actionmenu.styl
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@require 'settings/palette.styl'

.fil-mobileactionmenu
color var(--charcoalGrey)
hr
Expand Down
5 changes: 1 addition & 4 deletions packages/cozy-sharing/src/styles/autosuggest.styl
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@require 'settings/palette.styl'
@require 'settings/z-index.styl'

.container
position relative

Expand All @@ -9,7 +6,7 @@
position absolute
top 100%
margin-top .25rem
z-index $alert-index-mobile
z-index var(--zIndex-alertMobile)
width 100%
overflow hidden
box-shadow 0px 0px 0px 0.5px rgba(29, 33, 42, 0.12), 0px 2px 4px rgba(29, 33, 42, 0.0793047), 0px 4px 16px rgba(29, 33, 42, 0.06)
Expand Down
1 change: 0 additions & 1 deletion packages/cozy-sharing/src/styles/recipient.styl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@require 'components/button.styl'
@require 'settings/breakpoints.styl'
@require 'settings/palette.styl'

:root
--genericRecipientBackground: var(--slateGrey)
Expand Down
1 change: 0 additions & 1 deletion packages/cozy-sharing/src/styles/share.styl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@require 'components/forms.styl'
@require 'components/popover.styl'
@require 'settings/breakpoints.styl'
@require 'settings/palette.styl'

.share-byemail-onlybylink
background var(--paleGrey)
Expand Down
32 changes: 32 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10929,6 +10929,38 @@ cozy-ui@^103.8.0:
react-swipeable-views "^0.13.3"
rooks "^5.11.2"

cozy-ui@^103.8.2:
version "103.8.2"
resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-103.8.2.tgz#0f9cb4534be1c73e9e79571fc4830136f99e709e"
integrity sha512-Y3dC340N/nhq7oqxyAV2bXPJu50eIjIRPbj5UMLYSdRlvSWV7vmXwCbURRqLbq3RC8coseQR43p7NCl5yBjzEw==
dependencies:
"@babel/runtime" "^7.3.4"
"@material-ui/core" "4.12.3"
"@material-ui/lab" "^4.0.0-alpha.61"
"@popperjs/core" "^2.4.4"
bundlemon "^1.3.2"
chart.js "3.7.1"
classnames "^2.2.5"
cozy-interapp "^0.5.4"
date-fns "^1.28.5"
filesize "8.0.7"
hammerjs "^2.0.8"
intersection-observer "0.11.0"
mime-types "2.1.35"
mui-bottom-sheet "https://github.com/cozy/mui-bottom-sheet.git#v1.0.9"
node-polyglot "^2.2.2"
normalize.css "^8.0.0"
pdf-lib "1.17.1"
piwik-react-router "0.12.1"
react-chartjs-2 "4.1.0"
react-markdown "^4.0.8"
react-pdf "^5.7.2"
react-popper "^2.2.3"
react-remove-scroll "^2.4.0"
react-select "^4.3.0"
react-swipeable-views "^0.13.3"
rooks "^5.11.2"

create-ecdh@^4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
Expand Down

0 comments on commit f09507c

Please sign in to comment.