Merge branch 'master' into master

ant-design · Apr 17, 2024 · 9e072fb · 9e072fb
2 parents a678f5b + a512f81
commit 9e072fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/components/popover/__tests__/index.test.tsx b/components/popover/__tests__/index.test.tsx
@@ -28,6 +28,15 @@ describe('Popover', () => {
     expect(container.querySelector('.ant-popover-inner-content')).toBeTruthy();
   });
 
+  it('should support defaultOpen', () => {
+    const { container } = render(
+      <Popover title="code" defaultOpen>
+        <span>show me your code</span>
+      </Popover>,
+    );
+    expect(container.querySelector('.ant-popover')).toBeTruthy();
+  });
+
   it('shows content for render functions', () => {
     const renderTitle = () => 'some-title';
     const renderContent = () => 'some-content';

diff --git a/components/popover/index.tsx b/components/popover/index.tsx
@@ -60,6 +60,7 @@ const InternalPopover = React.forwardRef<TooltipRef, PopoverProps>((props, ref)
   const overlayCls = classNames(overlayClassName, hashId, cssVarCls);
   const [open, setOpen] = useMergedState(false, {
     value: props.open ?? props.visible,
+    defaultValue: props.defaultOpen ?? props.defaultVisible,
   });
 
   const settingOpen = (

diff --git a/components/theme/util/calc/CSSCalculator.ts b/components/theme/util/calc/CSSCalculator.ts
@@ -2,6 +2,8 @@ import AbstractCalculator from './calculator';
 
 const CALC_UNIT = 'CALC_UNIT';
 
+const regexp = new RegExp(CALC_UNIT, 'g');
+
 function unit(value: string | number) {
   if (typeof value === 'number') {
     return `${value}${CALC_UNIT}`;
@@ -77,7 +79,6 @@ export default class CSSCalculator extends AbstractCalculator {
 
   equal(options?: { unit?: boolean }): string {
     const { unit: cssUnit = true } = options || {};
-    const regexp = new RegExp(`${CALC_UNIT}`, 'g');
     this.result = this.result.replace(regexp, cssUnit ? 'px' : '');
     if (typeof this.lowPriority !== 'undefined') {
       return `calc(${this.result})`;