Skip to content

Commit 4cbfa08

Browse files
authored
refactor: use renderable guard for placeholder (#532)
1 parent ca57540 commit 4cbfa08

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"dependencies": {
4545
"@rc-component/motion": "^1.0.0",
4646
"@rc-component/portal": "^2.1.2",
47-
"@rc-component/util": "^1.11.1",
47+
"@rc-component/util": "^1.13.0",
4848
"clsx": "^2.1.1"
4949
},
5050
"devDependencies": {

src/Image.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useControlledState } from '@rc-component/util';
1+
import { isReactRenderable, useControlledState } from '@rc-component/util';
22
import { clsx } from 'clsx';
33
import * as React from 'react';
44
import { useContext, useMemo, useState } from 'react';
@@ -152,7 +152,7 @@ const ImageInternal: CompoundedComponent<ImageProps> = props => {
152152
};
153153

154154
// ========================= ImageProps =========================
155-
const isCustomPlaceholder = placeholder && placeholder !== true;
155+
const isCustomPlaceholder = isReactRenderable(placeholder) && placeholder !== true;
156156

157157
const src = previewSrc ?? imgSrc;
158158
const [getImgRef, srcAndOnload, status] = useStatus({
@@ -273,7 +273,7 @@ const ImageInternal: CompoundedComponent<ImageProps> = props => {
273273
onError={onError}
274274
/>
275275

276-
{status === 'loading' && (
276+
{status === 'loading' && isCustomPlaceholder && (
277277
<div aria-hidden="true" className={`${prefixCls}-placeholder`}>
278278
{placeholder}
279279
</div>

0 commit comments

Comments
 (0)