Merge pull request #201 from fracht/add-focus-index-parameter-for-sea…

…rch-messages

Fixed 'update search results' behavior when receiving a new message

.changeset/tiny-trees-carry.md

@@ -0,0 +1,6 @@
+---
+'@rchat/client': minor
+'@rchat/react': minor
+---
+
+Fixed 'update search results' behavior when receiving a new message

.github/workflows/ci.yml

@@ -0,0 +1,58 @@
+name: Continuous Integration
+on:
+    pull_request:
+        branches: [main]
+        types: [labeled, opened, synchronize, reopened]
+jobs:
+    # build:
+    #     name: Build, test & lint
+    #     runs-on: ubuntu-latest
+    #     steps:
+    #         - name: Checkout
+    #           uses: actions/checkout@v4
+    #           with:
+    #               fetch-depth: 0
+
+    #         - name: Use Node 20
+    #           uses: actions/setup-node@v4
+    #           with:
+    #               node-version: 20
+
+    #         - name: Install pnpm 9.8.0
+    #           uses: pnpm/[email protected]
+    #           with:
+    #               version: 9.8.0
+
+    #         - name: Install pnpm dependencies (with cache)
+    #           uses: covbot/pnpm-install-with-cache@v1
+
+    #         - name: Build, test & lint
+    #           run: pnpm run ci --filter=...[${{ github.event.pull_request.base.sha }}...${{ github.sha }}]
+    changeset:
+        name: Check for changeset existence
+        runs-on: ubuntu-latest
+        if: ${{ !contains(github.event.pull_request.labels.*.name, 'chore') }}
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Use Node 20
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+
+            - name: Install pnpm 9.8.0
+              uses: pnpm/[email protected]
+              with:
+                  version: 9.8.0
+
+            - name: Install pnpm dependencies (with cache)
+              uses: covbot/pnpm-install-with-cache@v1
+
+            - name: Danger
+              run: pnpm danger ci
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -14,17 +14,17 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout Repo
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
-            - name: Setup Node.js 16.x
-              uses: actions/setup-node@v2
+            - name: Setup Node.js 20
+              uses: actions/setup-node@v4
               with:
-                  node-version: 16.x
+                  node-version: 20
 
-            - name: Install pnpm 8.6.12
-              uses: pnpm/action-setup@v2.2.4
+            - name: Install pnpm 9.8.0
+              uses: pnpm/action-setup@v4.0.0
               with:
-                  version: 8.6.12
+                  version: 9.8.0
 
             - name: Install pnpm dependencies (with cache)
               uses: covbot/pnpm-install-with-cache@v1

.gitignore

@@ -21,4 +21,5 @@ yarn-error.log*
 
 scripts/*.mjs
 coverage
-**/.turbo
+**/.turbo
+**/.storybook

package.json

@@ -2,28 +2,28 @@
 	"name": "rchat",
 	"version": "0.0.0",
 	"private": true,
-	"packageManager": "[email protected]",
 	"scripts": {
 		"build": "turbo run build",
 		"bump": "changeset version && pnpm i --lockfile-only",
-		"ci": "turbo run lint test build",
-		"dev": "turbo run dev --parallel",
+		"ci": "turbo run lint test build --env-mode=loose",
+		"dev": "turbo watch build",
 		"format": "syncpack format && prettier --write **/*.{ts,tsx,js,jsx,json,yml,md}",
 		"release": "pnpm build && changeset tag && pnpm publish -r"
 	},
 	"devDependencies": {
-		"@changesets/cli": "^2.26.0",
-		"@types/jest": "^29.2.0",
-		"clean-publish": "^4.0.1",
-		"danger": "^11.2.4",
-		"prettier": "^2.8.4",
-		"syncpack": "^8.2.4",
-		"turbo": "^1.4.3",
-		"typescript": "^5.0.4"
+		"@changesets/cli": "^2.27.7",
+		"@types/jest": "^29.5.12",
+		"clean-publish": "^5.0.0",
+		"danger": "^12.3.3",
+		"prettier": "^3.3.3",
+		"syncpack": "^12.4.0",
+		"turbo": "^2.0.14",
+		"typescript": "^5.5.4"
 	},
 	"pnpm": {
 		"patchedDependencies": {
 			"[email protected]": "patches/[email protected]"
 		}
-	}
+	},
+	"packageManager": "[email protected]"
 }

packages/client/eslint.config.mjs

@@ -0,0 +1,17 @@
+import config from '@sirse-dev/eslint-config';
+
+export default [
+	{
+		ignores: [
+			'**/node_modules',
+			'**/dist',
+			'**/*.config.js',
+			'**/*.test.js',
+			'**/*.test.ts',
+			'**/stories',
+			'**/test',
+			'**/prepared-package',
+		],
+	},
+	...config,
+];

packages/client/package.json

@@ -13,10 +13,10 @@
 		"directory": "prepared-package"
 	},
 	"scripts": {
-		"build": "aqu build",
-		"dev": "aqu watch --no-cleanup",
+		"build": "aqu build && rimraf ./prepared-package && clean-publish",
+		"lint": "eslint **/*.{ts,tsx}",
 		"postpublish": "rimraf ./prepared-package",
-		"prepublishOnly": "rimraf ./prepared-package && clean-publish"
+		"prepublishOnly": "pnpm build"
 	},
 	"dependencies": {
 		"@rchat/shared": "workspace:*"

packages/client/src/ChatClient.ts

@@ -7,7 +7,11 @@ type Self<T> = T;
 
 export type ChatClientEventMap<TMessage> = Self<
 	ChatSocketListenMap<TMessage> & {
-		receiveSearchResults: (roomIdentifier: string, result: MessageSearchResult<TMessage>) => void;
+		receiveSearchResults: (
+			roomIdentifier: string,
+			result: MessageSearchResult<TMessage>,
+			focusIndex: number,
+		) => void;
 		nextSearchResult: (roomIdentifier: string) => void;
 		previousSearchResult: (roomIdentifier: string) => void;
 	}
@@ -18,7 +22,10 @@ export class ChatClient<TMessage> extends CustomEventTarget<ChatClientEventMap<T
 
 	public constructor(url: string, api: ChatAPI<TMessage>);
 	public constructor(socket: ChatClientSocket<TMessage>, api: ChatAPI<TMessage>);
-	public constructor(urlOrSocket: string | ChatClientSocket<TMessage>, private readonly api: ChatAPI<TMessage>) {
+	public constructor(
+		urlOrSocket: string | ChatClientSocket<TMessage>,
+		private readonly api: ChatAPI<TMessage>,
+	) {
 		super();
 		if (typeof urlOrSocket === 'string') {
 			this.socket = io(urlOrSocket);
@@ -36,10 +43,10 @@ export class ChatClient<TMessage> extends CustomEventTarget<ChatClientEventMap<T
 
 	public fetchMessages: MessageFetcher<TMessage>;
 
-	public searchMessages = async (roomIdentifier: string, criteria: unknown) => {
+	public searchMessages = async (roomIdentifier: string, criteria: unknown, focusIndex: number) => {
 		const result = await this.api.searchMessages(roomIdentifier, criteria);
 
-		this.dispatchEvent('receiveSearchResults', roomIdentifier, result);
+		this.dispatchEvent('receiveSearchResults', roomIdentifier, result, focusIndex);
 
 		return {
 			result,

packages/material/eslint.config.mjs

@@ -0,0 +1,22 @@
+import config from '@sirse-dev/eslint-config';
+
+export default [
+	{
+		ignores: [
+			'**/node_modules',
+			'**/dist',
+			'**/*.config.js',
+			'**/*.test.js',
+			'**/*.test.ts',
+			'**/stories',
+			'**/test',
+			'**/prepared-package',
+		],
+	},
+	...config,
+	{
+		rules: {
+			'@typescript-eslint/no-empty-object-type': 'off',
+		},
+	},
+];

packages/material/package.json

@@ -9,17 +9,14 @@
 		"directory": "prepared-package"
 	},
 	"scripts": {
-		"build": "tsc",
+		"build": "tsc && rimraf ./prepared-package && clean-publish",
 		"build-storybook": "build-storybook",
-		"dev": "tsc --watch",
 		"lint": "eslint **/*.{ts,tsx}",
 		"lint:fix": "eslint . --fix",
 		"postpublish": "rimraf ./prepared-package",
-		"prepublishOnly": "rimraf ./prepared-package && clean-publish",
+		"prepublishOnly": "pnpm build",
 		"release": "np",
-		"storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 6006",
-		"test": "aqu test --passWithNoTests",
-		"test:watch": "aqu test --passWithNoTests --watch"
+		"storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 6006"
 	},
 	"dependencies": {
 		"@mui/icons-material": "^5.10.6",

packages/material/src/AccountAvatar/AccountAvatar.tsx

@@ -1,5 +1,5 @@
-import Avatar, { AvatarProps } from '@mui/material/Avatar';
 import PersonRounded from '@mui/icons-material/PersonRounded';
+import Avatar, { AvatarProps } from '@mui/material/Avatar';
 import { getContrastRatio } from '@mui/system/colorManipulator';
 import { ElementType } from 'react';
 import { styled } from '../styles/styled';
@@ -19,14 +19,14 @@ const AccountAvatarRoot = styled<InternalAccountAvatarProps, typeof Avatar>(Avat
 	return { width: 28, height: 28, color, backgroundColor, fontSize: theme.typography.body2.fontSize };
 });
 
-const getInitials = (username: string): string | null => {
+const getInitials = (username: string): string | undefined => {
 	const words = username
 		.split(/\s+/g)
-		.map((value) => value.replace(/[^\p{L}]/gu, ''))
+		.map((value) => value.replaceAll(/[^\p{L}]/gu, ''))
 		.filter(Boolean);
 
 	if (words.length === 0) {
-		return null;
+		return undefined;
 	}
 
 	return words[0][0] + (words[1]?.[0] || '');

packages/material/src/MessageBox/MessageBox.tsx

@@ -1,11 +1,11 @@
 import { CSSObject } from '@mui/material';
 import { ElementType, forwardRef, ReactElement, Ref } from 'react';
+import { MessageOrientation } from './MessageOrientation';
+import { MessageTime } from './MessageTime';
 import { AccountAvatar } from '../AccountAvatar';
 import { createMuiComponent, MuiComponentProps } from '../helpers/createMuiComponent';
 import { MuiAccountInfo } from '../helpers/MuiAccountInfo';
 import { styled } from '../styles/styled';
-import { MessageOrientation } from './MessageOrientation';
-import { MessageTime } from './MessageTime';
 
 export type MessagePosition = 'start' | 'middle' | 'end' | 'single';