From 8c8b9cb43b66a4032f2497039f19be6f2c2372e4 Mon Sep 17 00:00:00 2001 From: atanas-vasilev-dev Date: Wed, 15 May 2019 11:00:03 +0300 Subject: [PATCH] add taxonomy term argument to association field request; export some unexposed dependencies, needed for a custom field --- core/REST_API/Router.php | 7 ++++++- languages/carbon-fields-ui.pot | 28 ++++++++++++++++++---------- packages/core/index.js | 3 +++ packages/metaboxes/index.js | 1 + 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/core/REST_API/Router.php b/core/REST_API/Router.php index cf23f6039..36f9ad2c0 100644 --- a/core/REST_API/Router.php +++ b/core/REST_API/Router.php @@ -302,15 +302,20 @@ public function get_association_data() { $options = array_map( function ( $option ) { $option = explode( ':', $option ); - return [ + $res = [ 'id' => $option[0], 'type' => $option[1], 'subtype' => $option[2], ]; + if ( ! empty( $option[3] ) ) { + $res['taxTerm'] = intval( $option[3] ); + } + return $res; }, $options ); foreach ( $options as $option ) { $item = array( + 'taxTerm' => ! empty( $option['taxTerm'] ) ? $option['taxTerm'] : 0, 'type' => $option['type'], 'subtype' => $option['subtype'], 'thumbnail' => $field->get_thumbnail_by_type( $option['id'], $option['type'], $option['subtype'] ), diff --git a/languages/carbon-fields-ui.pot b/languages/carbon-fields-ui.pot index 0f8ba00f3..34ca7283e 100644 --- a/languages/carbon-fields-ui.pot +++ b/languages/carbon-fields-ui.pot @@ -3,15 +3,15 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "X-Generator: babel-plugin-makepot\n" -#: packages/blocks/components/block-edit/index.js:201 +#: packages/blocks/components/block-edit/index.js:214 msgid "Show preview" msgstr "" -#: packages/blocks/components/block-edit/index.js:202 +#: packages/blocks/components/block-edit/index.js:215 msgid "Hide preview" msgstr "" -#: packages/blocks/components/block-edit/index.js:271 +#: packages/blocks/components/block-edit/index.js:286 msgid "Fields" msgstr "" @@ -19,6 +19,14 @@ msgstr "" msgid "Field of type '%s' is not supported in Gutenberg." msgstr "" +#: packages/blocks/components/server-side-render/index.js:129 +msgid "Error loading block: %s" +msgstr "" + +#: packages/blocks/components/server-side-render/index.js:135 +msgid "No results found." +msgstr "" + #: packages/blocks/fields/datetime/index.js:59 #: packages/core/fields/date/index.js:15 #: packages/metaboxes/fields/datetime/index.js:9 @@ -63,29 +71,29 @@ msgstr "" msgid "Search..." msgstr "" -#: packages/core/fields/association/index.js:113 +#: packages/core/fields/association/index.js:168 msgid "Maximum number of items reached (%s items)" msgstr "" -#: packages/core/fields/association/index.js:204 +#: packages/core/fields/association/index.js:266 msgid "Showing %1$d of %2$d results" msgstr "" -#: packages/core/fields/association/index.js:380 +#: packages/core/fields/association/index.js:449 msgid "An error occurred while trying to fetch association options." msgstr "" -#: packages/core/fields/association/index.js:430 +#: packages/core/fields/association/index.js:506 #: packages/core/fields/complex/index.js:428 #: packages/core/hocs/with-validation/required.js:20 msgid "This field is required." msgstr "" -#: packages/core/fields/association/index.js:434 +#: packages/core/fields/association/index.js:510 msgid "Minimum number of items not reached (%s items)" msgstr "" -#: packages/core/fields/color/index.js:86 +#: packages/core/fields/color/index.js:92 msgid "Select a color" msgstr "" @@ -197,7 +205,7 @@ msgstr "" msgid "An error occurred while trying to fetch files data." msgstr "" -#: packages/metaboxes/containers/index.js:52 +#: packages/metaboxes/containers/index.js:55 msgid "Could not find DOM element for container \"%1$s\"." msgstr "" diff --git a/packages/core/index.js b/packages/core/index.js index cc7bfcbaa..97f1229ba 100644 --- a/packages/core/index.js +++ b/packages/core/index.js @@ -21,12 +21,15 @@ setLocaleData( window.cf.config.locale, 'carbon-fields-ui' ); export { createRegistry } from './registry'; export { getFieldType, registerFieldType } from './registry/fields'; export { default as Field } from './components/field'; +export { default as SearchInput } from './components/search-input'; +export { default as Sortable } from './components/sortable'; export { default as withFilters } from './hocs/with-filters'; export { default as withProps } from './hocs/with-props'; export { default as withValidation } from './hocs/with-validation'; export { default as withConditionalLogic } from './hocs/with-conditional-logic'; export { default as uniqueId } from './utils/unique-id'; export { default as fromSelector } from './utils/from-selector'; +export { default as apiFetch } from './utils/api-fetch'; /** * Triggers the initialization of Carbon Fields. diff --git a/packages/metaboxes/index.js b/packages/metaboxes/index.js index 4d85d20c1..d2a43ee7d 100644 --- a/packages/metaboxes/index.js +++ b/packages/metaboxes/index.js @@ -17,6 +17,7 @@ import isGutenberg from './utils/is-gutenberg'; * Public API. */ export { registerContainerType, getContainerType } from './containers/registry'; +export { default as stripCompactInputPrefix } from './utils/strip-compact-input-prefix'; /** * Sets the locale data for the package type