Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Move FormattedMonetaryAmount to the components package #11230

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Move FormattedMonetaryAmount to the components package #11230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28c2e94
Move FormattedMonetaryAmount to the components package
opr Oct 12, 2023
c9bd199
Update imports of FormattedMonetaryAmount
opr Oct 12, 2023
407f175
Change import path in the checkout components package
opr Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/js/base/components/cart-checkout/product-sale-badge/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
import { createInterpolateElement } from '@wordpress/element';
import { __, sprintf } from '@wordpress/i18n';
import FormattedMonetaryAmount from '@woocommerce/base-components/formatted-monetary-amount';
import { FormattedMonetaryAmount } from '@woocommerce/blocks-components';
import type { Currency } from '@woocommerce/price-format';

/**
Expand Down
2 changes: 1 addition & 1 deletion ...se/components/cart-checkout/shipping-rates-control-package/render-package-rate-option.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
import { decodeEntities } from '@wordpress/html-entities';
import { getCurrencyFromPriceResponse } from '@woocommerce/price-format';
import FormattedMonetaryAmount from '@woocommerce/base-components/formatted-monetary-amount';
import { FormattedMonetaryAmount } from '@woocommerce/blocks-components';
import type { PackageRateOption } from '@woocommerce/types';
import { getSetting } from '@woocommerce/settings';
import { CartShippingPackageShippingRate } from '@woocommerce/types';
Expand Down
2 changes: 1 addition & 1 deletion assets/js/base/components/cart-checkout/totals/footer-item/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { __, sprintf } from '@wordpress/i18n';
import classNames from 'classnames';
import { createInterpolateElement } from '@wordpress/element';
import FormattedMonetaryAmount from '@woocommerce/base-components/formatted-monetary-amount';
import { FormattedMonetaryAmount } from '@woocommerce/blocks-components';
import { applyCheckoutFilter, TotalsItem } from '@woocommerce/blocks-checkout';
import { useStoreCart } from '@woocommerce/base-context/hooks';
import { getSetting } from '@woocommerce/settings';
Expand Down
2 changes: 1 addition & 1 deletion assets/js/base/components/price-slider/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
useLayoutEffect,
} from '@wordpress/element';
import classnames from 'classnames';
import FormattedMonetaryAmount from '@woocommerce/base-components/formatted-monetary-amount';
import { FormattedMonetaryAmount } from '@woocommerce/blocks-components';
import { Currency, isObject } from '@woocommerce/types';
import { useDebouncedCallback } from 'use-debounce';

Expand Down
2 changes: 1 addition & 1 deletion assets/js/base/components/product-price/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* External dependencies
*/
import { __, sprintf } from '@wordpress/i18n';
import FormattedMonetaryAmount from '@woocommerce/base-components/formatted-monetary-amount';
import { FormattedMonetaryAmount } from '@woocommerce/blocks-components';
import classNames from 'classnames';
import { formatPrice } from '@woocommerce/price-format';
import { createInterpolateElement } from '@wordpress/element';
Expand Down
2 changes: 1 addition & 1 deletion assets/js/blocks/checkout/inner-blocks/checkout-pickup-options-block/block.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from '@wordpress/element';
import { useShippingData, useStoreCart } from '@woocommerce/base-context/hooks';
import { getCurrencyFromPriceResponse } from '@woocommerce/price-format';
import FormattedMonetaryAmount from '@woocommerce/base-components/formatted-monetary-amount';
import { FormattedMonetaryAmount } from '@woocommerce/blocks-components';
import { decodeEntities } from '@wordpress/html-entities';
import { getSetting } from '@woocommerce/settings';
import { Icon, mapMarker } from '@wordpress/icons';
Expand Down
2 changes: 1 addition & 1 deletion assets/js/blocks/checkout/inner-blocks/checkout-shipping-method-block/shared/rate-price.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { __ } from '@wordpress/i18n';
import { getSetting } from '@woocommerce/settings';
import { createInterpolateElement } from '@wordpress/element';
import { getCurrencyFromPriceResponse } from '@woocommerce/price-format';
import FormattedMonetaryAmount from '@woocommerce/base-components/formatted-monetary-amount';
import { FormattedMonetaryAmount } from '@woocommerce/blocks-components';
import type { CartShippingPackageShippingRate } from '@woocommerce/type-defs/cart';

export const RatePrice = ( {
Expand Down
2 changes: 1 addition & 1 deletion assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/block.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
isAddressComplete,
} from '@woocommerce/base-utils';
import { getCurrencyFromPriceResponse } from '@woocommerce/price-format';
import FormattedMonetaryAmount from '@woocommerce/base-components/formatted-monetary-amount';
import { FormattedMonetaryAmount } from '@woocommerce/blocks-components';
import { useEditorContext, noticeContexts } from '@woocommerce/base-context';
import { StoreNoticesContainer } from '@woocommerce/blocks-checkout';
import { decodeEntities } from '@wordpress/html-entities';
Expand Down
2 changes: 1 addition & 1 deletion packages/checkout/components/totals/item/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
*/
import classnames from 'classnames';
import { isValidElement } from '@wordpress/element';
import FormattedMonetaryAmount from '@woocommerce/base-components/formatted-monetary-amount';
import type { ReactElement, ReactNode } from 'react';
import type { Currency } from '@woocommerce/price-format';

/**
* Internal dependencies
*/
import './style.scss';
import FormattedMonetaryAmount from '../../../../components/formatted-monetary-amount';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For my learning why we're not able to import this as below?

import { FormattedMonetaryAmount } from '@woocommerce/blocks-components';

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's because it causes a circular dependency, since this file is in the @woocommerce/blocks-checkout package, loading from the @woocommerce/blocks-components package will cause the packages/components/index.js file to load, which in turn loads packages/components/checkbox-list which in turn imports CheckboxControl from packages/checkout/components which in turn loads packages/checkout/components/totals/item/index.tsx 😁

Hope that's easy to understand, if not feel free to load the packages/checkout/components/totals/item/index.tsx file and follow the dependency as if it were being loaded from the components package (packages/components/index.js) and see where it leads you.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha! Thank you for detailed explanation. 🙂


export interface TotalsItemProps {
className?: string;
Expand Down
0 ...nents/formatted-monetary-amount/index.tsx → ...nents/formatted-monetary-amount/index.tsx
View file
Open in desktop
File renamed without changes.
0 ...ents/formatted-monetary-amount/style.scss → ...ents/formatted-monetary-amount/style.scss
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions packages/components/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export { default as CheckboxList } from './checkbox-list';
export { default as FormattedMonetaryAmount } from './formatted-monetary-amount';
export { Chip, RemovableChip } from './chip';
Loading