Skip to content

Commit

Permalink
feat(support labels for scrolltop): labels for scrolltop
Browse files Browse the repository at this point in the history
  • Loading branch information
rileylnapier committed Oct 27, 2023
1 parent abea4c2 commit 7b6441e
Show file tree
Hide file tree
Showing 16 changed files with 44 additions and 34 deletions.
2 changes: 1 addition & 1 deletion packages/client-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/client-api",
"version": "4.3.2",
"version": "4.4.0",
"description": "",
"main": "dist/index.js",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/client-graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/client-graphql",
"version": "4.3.2",
"version": "4.4.0",
"description": "",
"main": "dist/index.js",
"types": "typings/index.d.ts",
Expand Down
12 changes: 6 additions & 6 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/components",
"version": "4.3.2",
"version": "4.4.0",
"private": true,
"description": "Beautiful, easy React toast notifications",
"author": "Courier <support@courier.com>",
Expand All @@ -18,11 +18,11 @@
"license": "MIT",
"dependencies": {
"@trycourier/courier": "^1.3.0",
"@trycourier/react-brand-designer": "^4.3.2",
"@trycourier/react-inbox": "^4.3.2",
"@trycourier/react-preferences": "^4.3.2",
"@trycourier/react-provider": "^4.3.2",
"@trycourier/react-toast": "^4.3.2",
"@trycourier/react-brand-designer": "^4.4.0",
"@trycourier/react-inbox": "^4.4.0",
"@trycourier/react-preferences": "^4.4.0",
"@trycourier/react-provider": "^4.4.0",
"@trycourier/react-toast": "^4.4.0",
"babel-loader": "^8.0.6",
"babel-preset-preact": "^2.0.0",
"camel-case": "^4.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-brand-designer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/react-brand-designer",
"version": "4.3.2",
"version": "4.4.0",
"description": "Embeddable brand designer for multi-channel notifications",
"homepage": "https://github.com/trycourier/courier-react/tree/main/packages/react-elements#readme",
"license": "ISC",
Expand Down Expand Up @@ -29,7 +29,7 @@
"url": "https://github.com/trycourier/courier-react/issues"
},
"dependencies": {
"@trycourier/react-elements": "^4.3.2",
"@trycourier/react-elements": "^4.4.0",
"rimraf": "^3.0.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-elements/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/react-elements",
"version": "4.3.2",
"version": "4.4.0",
"description": "Shareable components for each Courier package",
"author": "Drew Youngwerth <drew@youngwerth.com>",
"homepage": "https://github.com/trycourier/courier-react/tree/main/packages/react-elements#readme",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-hooks/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/react-hooks",
"version": "4.3.2",
"version": "4.4.0",
"description": "",
"main": "dist/index.js",
"types": "typings/index.d.ts",
Expand All @@ -20,7 +20,7 @@
"concat-md": "^0.3.5"
},
"dependencies": {
"@trycourier/client-graphql": "^4.3.2",
"@trycourier/client-graphql": "^4.4.0",
"deep-extend": "^0.6.0",
"rimraf": "^3.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react-inbox-next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/react-inbox-next",
"version": "4.3.2",
"version": "4.4.0",
"description": "",
"private": true,
"main": "dist/index.js",
Expand Down
1 change: 1 addition & 0 deletions packages/react-inbox/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ interface InboxProps {
markAllAsRead?: string;
markAsRead?: string;
markAsUnread?: string;
scrollTop?: string | (count: string) => string;
}
// Placement of the Bell relative to the Inbox
Expand Down
10 changes: 5 additions & 5 deletions packages/react-inbox/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/react-inbox",
"version": "4.3.2",
"version": "4.4.0",
"description": "",
"main": "dist/index.js",
"types": "typings/index.d.ts",
Expand All @@ -20,10 +20,10 @@
"dependencies": {
"@fontsource/poppins": "^4.5.9",
"@tippyjs/react": "^4.2.3",
"@trycourier/client-graphql": "^4.3.2",
"@trycourier/react-elements": "^4.3.2",
"@trycourier/react-hooks": "^4.3.2",
"@trycourier/react-preferences": "^4.3.2",
"@trycourier/client-graphql": "^4.4.0",
"@trycourier/react-elements": "^4.4.0",
"@trycourier/react-hooks": "^4.4.0",
"@trycourier/react-preferences": "^4.4.0",
"classnames": "^2.2.6",
"date-fns": "^2.19.0",
"deep-extend": "^0.6.0",
Expand Down
10 changes: 9 additions & 1 deletion packages/react-inbox/src/components/Messages2.0/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,14 @@ const Messages: React.ForwardRefExoticComponent<
};

const scrollTopMessage = useMemo(() => {
if (typeof labels?.scrollTop === "string") {
return labels?.scrollTop;
}

if (typeof labels?.scrollTop === "function") {
return labels?.scrollTop(pinned.length);
}

if (pinned.length) {
const label =
brand?.inapp?.slots?.length === 1
Expand All @@ -314,7 +322,7 @@ const Messages: React.ForwardRefExoticComponent<
}

return "Scroll Top";
}, [pinned.length, brand]);
}, [pinned.length, brand, labels?.scrollTop]);

return (
<ResponsiveContainer ref={ref} isMobile={isMobile}>
Expand Down
1 change: 1 addition & 0 deletions packages/react-inbox/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export interface InboxProps {
markAllAsRead?: string;
markAsRead?: string;
markAsUnread?: string;
scrollTop?: string | ((count: string) => string);
};
onEvent?: OnEvent;
openLinksInNewTab?: boolean;
Expand Down
4 changes: 2 additions & 2 deletions packages/react-preferences/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/react-preferences",
"version": "4.3.2",
"version": "4.4.0",
"main": "dist/index.js",
"types": "typings/index.d.ts",
"scripts": {
Expand All @@ -23,7 +23,7 @@
],
"license": "ISC",
"dependencies": {
"@trycourier/react-hooks": "^4.3.2",
"@trycourier/react-hooks": "^4.4.0",
"react-toggle": "^4.1.2",
"styled-components": "^5.3.6"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/react-provider/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/react-provider",
"version": "4.3.2",
"version": "4.4.0",
"description": "",
"main": "dist/index.js",
"types": "typings/index.d.ts",
Expand All @@ -16,7 +16,7 @@
},
"license": "ISC",
"dependencies": {
"@trycourier/client-graphql": "^4.3.2",
"@trycourier/client-graphql": "^4.4.0",
"buffer": "^6.0.3",
"jwt-decode": "^3.1.2",
"react-use": "^17.2.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-toast/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/react-toast",
"version": "4.3.2",
"version": "4.4.0",
"description": "Beautiful, easy React toast notifications",
"main": "dist/index.js",
"types": "typings/index.d.ts",
Expand All @@ -24,7 +24,7 @@
"concat-md": "^0.3.5"
},
"dependencies": {
"@trycourier/react-hooks": "^4.3.2",
"@trycourier/react-hooks": "^4.4.0",
"deep-extend": "^0.6.0",
"markdown-to-jsx": "7.1.7",
"react-toastify": "^9.1.3",
Expand Down
14 changes: 7 additions & 7 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trycourier/storybook",
"version": "4.3.2",
"version": "4.4.0",
"private": true,
"description": "Beautiful, easy React toast notifications",
"author": "Courier <support@courier.com>",
Expand All @@ -23,12 +23,12 @@
"@storybook/addon-links": "^6.5.9",
"@storybook/addon-viewport": "^6.5.9",
"@storybook/react": "^6.5.9",
"@trycourier/components": "^4.3.2",
"@trycourier/react-brand-designer": "^4.3.2",
"@trycourier/react-inbox": "^4.3.2",
"@trycourier/react-preferences": "^4.3.2",
"@trycourier/react-provider": "^4.3.2",
"@trycourier/react-toast": "^4.3.2",
"@trycourier/components": "^4.4.0",
"@trycourier/react-brand-designer": "^4.4.0",
"@trycourier/react-inbox": "^4.4.0",
"@trycourier/react-preferences": "^4.4.0",
"@trycourier/react-provider": "^4.4.0",
"@trycourier/react-toast": "^4.4.0",
"react-frame-component": "^5.2.3",
"react-markdown": "^8.0.1",
"rehype-raw": "^6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@trycourier/types",
"private": true,
"version": "4.3.2",
"version": "4.4.0",
"main": "index.d.ts",
"types": "index.d.ts",
"scripts": {}
Expand Down

0 comments on commit 7b6441e

Please sign in to comment.