Merge branch 'main' of github.com:blb-ventures/react-flat-list

blb-ventures · Apr 28, 2023 · 201a515 · 201a515
2 parents 95e7f4b + ed0ef68
commit 201a515
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blb-ventures/react-flat-list",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "",
   "main": "./lib/index.js",
   "module": "./lib/index.mjs",

diff --git a/src/flat-list-empty-message.tsx b/src/flat-list-empty-message.tsx
@@ -1,6 +1,6 @@
 import { FC, ReactNode } from 'react';
 
-export const FlatListEmptyMessage: FC<{ children: ReactNode; className: string }> = ({
+export const FlatListEmptyMessage: FC<{ children: ReactNode; className?: string }> = ({
   children,
   className,
-}) => <div className={`flat-list-empty-message ${className}`}>{children}</div>;
+}) => <div className={`flat-list-empty-message ${className ?? ''}`}>{children}</div>;
diff --git a/src/flat-list-item.tsx b/src/flat-list-item.tsx
@@ -17,7 +17,7 @@ export interface FlatListItemProps {
   className?: string;
   contentClassName?: string;
   actionIcon?: ReactNode;
-  subtitleRight?: string;
+  subtitleRight?: string | ReactNode;
   subtitleRightClassName?: string;
   subtitleLeft?: string | ReactNode;
   subtitleCenterClassName?: string;
@@ -101,8 +101,10 @@ export const FlatListItem: FC<FlatListItemProps> = ({
           ) : (
             imageRight
           )}
-          {subtitleRight != null && (
+          {typeof subtitleRight === 'string' ? (
             <div className="flat-list-item-content-right-subtitle">{subtitleRight}</div>
+          ) : (
+            subtitleRight
           )}
           {right}
           {hasActionIcon && (

diff --git a/src/object-flat-list-item.tsx b/src/object-flat-list-item.tsx
@@ -49,7 +49,7 @@ export const ObjectFlatListItem = <DataType extends Record<string, any>>({
     const value = isKeyData(data) ? extra.obj[data.key] : data.getValue(extra.obj);
     if (data.formatter) return data.formatter(value);
     return value != null ? String(value) : null;
-  }, [data, extra]);
+  }, [data, extra.obj]);
   const Component = extra.FlatListComponent ?? FlatListItem;
   return extra.obj == null ? null : (
     <Component

diff --git a/src/style.css b/src/style.css
@@ -53,7 +53,7 @@
 
 .flat-list-item-content-left-title {
   word-break: break-all;
-  font-weight: medium;
+  font-weight: 500;
 }
 
 .flat-list-item-content-left-subtitle {
@@ -81,8 +81,9 @@
 }
 
 .flat-list-error-message {
+  list-style: none;
   background-color: rgb(243, 244, 246);
-  font-weight: medium;
+  font-weight: 500;
   color: rgb(220, 38, 38);
 }
 
@@ -107,5 +108,5 @@
 .flat-list-subheader-title {
   font-size: 1.25rem/* 20px */;
   line-height: 1.75rem/* 28px */;
-  font-weight: medium;
+  font-weight: 500;
 }