@gitlab/ui 64.1.1 → 64.2.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [64.2.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v64.1.1...v64.2.0) (2023-06-02)
+
+
+### Features
+
+* **GlFilteredSearchToken:** Pass input attributes to data segment ([e8dcc5f](https://gitlab.com/gitlab-org/gitlab-ui/commit/e8dcc5f8fb8ff4b6fa78f1e46b899a18990d39c8))
+
 ## [64.1.1](https://gitlab.com/gitlab-org/gitlab-ui/compare/v64.1.0...v64.1.1) (2023-06-01)
 
 

package/dist/components/base/filtered_search/filtered_search_token.js

@@ -81,6 +81,11 @@ var script = {
       type: Boolean,
       required: false,
       default: false
+    },
+    dataSegmentInputAttributes: {
+      type: Object,
+      required: false,
+      default: () => ({})
     }
   },
   data() {
@@ -322,7 +327,7 @@ var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=
   var inputValue = ref.inputValue;
 return [_c('gl-token',{staticClass:"gl-filtered-search-token-type",class:_vm.getAdditionalSegmentClasses(_vm.$options.segments.SEGMENT_TITLE),attrs:{"view-only":""}},[_vm._v("\n        "+_vm._s(inputValue)+"\n      ")])]}}])}),_vm._v(" "),_c('gl-filtered-search-token-segment',{key:"operator-segment",attrs:{"active":_vm.isSegmentActive(_vm.$options.segments.SEGMENT_OPERATOR),"cursor-position":_vm.intendedCursorPosition,"options":_vm.operators,"option-text-field":"value","custom-input-keydown-handler":_vm.handleOperatorKeydown,"view-only":_vm.viewOnly},on:{"activate":function($event){return _vm.activateSegment(_vm.$options.segments.SEGMENT_OPERATOR)},"backspace":_vm.replaceWithTermIfEmpty,"complete":function($event){return _vm.activateSegment(_vm.$options.segments.SEGMENT_DATA)},"deactivate":function($event){return _vm.$emit('deactivate')},"previous":_vm.activatePreviousTitleSegment,"next":_vm.activateNextDataSegment},scopedSlots:_vm._u([{key:"view",fn:function(){return [_c('gl-token',{staticClass:"gl-filtered-search-token-operator",class:_vm.getAdditionalSegmentClasses(_vm.$options.segments.SEGMENT_OPERATOR),attrs:{"variant":"search-value","view-only":""}},[_vm._v("\n        "+_vm._s(_vm.operatorDescription)+"\n      ")])]},proxy:true},{key:"option",fn:function(ref){
   var option = ref.option;
-return [_c('div',{staticClass:"gl-display-flex"},[_vm._v("\n        "+_vm._s(_vm.showFriendlyText ? option.description : option.value)+"\n        "),(option.description)?_c('span',{staticClass:"gl-filtered-search-token-operator-description"},[_vm._v("\n          "+_vm._s(_vm.showFriendlyText ? option.value : option.description)+"\n        ")]):_vm._e()])]}}]),model:{value:(_vm.tokenValue.operator),callback:function ($$v) {_vm.$set(_vm.tokenValue, "operator", $$v);},expression:"tokenValue.operator"}}),_vm._v(" "),(_vm.hasDataOrDataSegmentIsCurrentlyActive)?_c('gl-filtered-search-token-segment',{key:"data-segment",attrs:{"active":_vm.isSegmentActive(_vm.$options.segments.SEGMENT_DATA),"cursor-position":_vm.intendedCursorPosition,"multi-select":_vm.config.multiSelect,"options":_vm.config.options,"view-only":_vm.viewOnly},on:{"activate":_vm.activateDataSegment,"backspace":function($event){return _vm.activateSegment(_vm.$options.segments.SEGMENT_OPERATOR)},"complete":_vm.handleComplete,"select":function($event){return _vm.$emit('select', $event)},"submit":function($event){return _vm.$emit('submit')},"deactivate":function($event){return _vm.$emit('deactivate')},"split":function($event){return _vm.$emit('split', $event)},"previous":_vm.activatePreviousOperatorSegment,"next":function($event){return _vm.$emit('next')}},scopedSlots:_vm._u([{key:"suggestions",fn:function(){return [_vm._t("suggestions")]},proxy:true},{key:"view",fn:function(ref){
+return [_c('div',{staticClass:"gl-display-flex"},[_vm._v("\n        "+_vm._s(_vm.showFriendlyText ? option.description : option.value)+"\n        "),(option.description)?_c('span',{staticClass:"gl-filtered-search-token-operator-description"},[_vm._v("\n          "+_vm._s(_vm.showFriendlyText ? option.value : option.description)+"\n        ")]):_vm._e()])]}}]),model:{value:(_vm.tokenValue.operator),callback:function ($$v) {_vm.$set(_vm.tokenValue, "operator", $$v);},expression:"tokenValue.operator"}}),_vm._v(" "),(_vm.hasDataOrDataSegmentIsCurrentlyActive)?_c('gl-filtered-search-token-segment',{key:"data-segment",attrs:{"active":_vm.isSegmentActive(_vm.$options.segments.SEGMENT_DATA),"cursor-position":_vm.intendedCursorPosition,"multi-select":_vm.config.multiSelect,"options":_vm.config.options,"view-only":_vm.viewOnly,"search-input-attributes":_vm.dataSegmentInputAttributes},on:{"activate":_vm.activateDataSegment,"backspace":function($event){return _vm.activateSegment(_vm.$options.segments.SEGMENT_OPERATOR)},"complete":_vm.handleComplete,"select":function($event){return _vm.$emit('select', $event)},"submit":function($event){return _vm.$emit('submit')},"deactivate":function($event){return _vm.$emit('deactivate')},"split":function($event){return _vm.$emit('split', $event)},"previous":_vm.activatePreviousOperatorSegment,"next":function($event){return _vm.$emit('next')}},scopedSlots:_vm._u([{key:"suggestions",fn:function(){return [_vm._t("suggestions")]},proxy:true},{key:"view",fn:function(ref){
   var inputValue = ref.inputValue;
 return [_vm._t("view-token",function(){return [_c('gl-token',_vm._g({staticClass:"gl-filtered-search-token-data",class:_vm.getAdditionalSegmentClasses(_vm.$options.segments.SEGMENT_DATA),attrs:{"variant":"search-value","view-only":_vm.viewOnly}},_vm.eventListeners),[_c('span',{staticClass:"gl-filtered-search-token-data-content"},[_vm._t("view",function(){return [_vm._v(_vm._s(inputValue))]},null,{ inputValue: inputValue })],2)])]},null,{
           inputValue: inputValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "64.1.1",
+  "version": "64.2.0",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",
@@ -85,7 +85,7 @@
   "devDependencies": {
     "@arkweid/lefthook": "0.7.7",
     "@babel/core": "^7.22.1",
-    "@babel/preset-env": "^7.22.2",
+    "@babel/preset-env": "^7.22.4",
     "@babel/preset-react": "^7.22.3",
     "@gitlab/eslint-plugin": "19.0.0",
     "@gitlab/fonts": "^1.2.0",

package/src/components/base/filtered_search/filtered_search_token.spec.js

@@ -210,6 +210,21 @@ describe('Filtered search token', () => {
     expect(wrapper.emitted().replace[0][0].value).toStrictEqual({ data: '' });
   });
 
+  it('sets input attributes on data segment when provided', () => {
+    const dataSegmentInputAttributes = {
+      placeholder: 'YYYY-MM-DD',
+      id: 'this-id',
+    };
+    createComponent({
+      active: true,
+      dataSegmentInputAttributes,
+      value: { operator: '=', data: 'something' },
+    });
+    expect(findDataSegment().props().searchInputAttributes).toStrictEqual(
+      dataSegmentInputAttributes
+    );
+  });
+
   describe('integration tests', () => {
     beforeAll(() => {
       if (!HTMLElement.prototype.scrollIntoView) {

package/src/components/base/filtered_search/filtered_search_token.stories.js

@@ -1,6 +1,7 @@
 import PortalVue from 'portal-vue';
 import Vue from 'vue';
 import GlIcon from '../icon/icon.vue';
+import GlDatepicker from '../datepicker/datepicker.vue';
 import { provide } from './common_story_options';
 import GlFilteredSearchSuggestion from './filtered_search_suggestion.vue';
 import readme from './filtered_search_token.md';
@@ -153,6 +154,53 @@ export const WithStaticOptions = (args, { argTypes }) => ({
 });
 WithStaticOptions.args = generateProps();
 
+// eslint-disable-next-line no-unused-vars
+export const WithDataSegmentInputAttributes = (args, { argTypes }) => ({
+  components: {
+    GlFilteredSearchToken,
+    GlDatepicker,
+  },
+  provide,
+  props: ['active'],
+  data() {
+    return {
+      value: { operator: '<', data: null },
+      config: {
+        title: 'Date',
+        operators: [
+          { value: '<', description: 'before' },
+          { value: '>', description: 'after' },
+        ],
+      },
+      dataSegmentInputAttributes: {
+        placeholder: 'YYYY-MM-DD',
+        id: 'this-id',
+      },
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      document.activeElement.blur();
+    });
+  },
+  template: `
+    <div>
+      <div> {{ value }} </div>
+      <div class="gl-border-1 gl-border-solid gl-border-gray-200">
+        <gl-filtered-search-token
+          v-model="value"
+          class="gl-h-full"
+          :config="config"
+          :active="active"
+          :data-segment-input-attributes="dataSegmentInputAttributes"
+        />
+        <gl-datepicker target='#this-id' />
+      </div>
+    </div>
+  `,
+});
+WithDataSegmentInputAttributes.args = generateProps();
+
 export default {
   title: 'base/filtered-search/token',
   component: GlFilteredSearchToken,

package/src/components/base/filtered_search/filtered_search_token.vue

@@ -78,6 +78,11 @@ export default {
       required: false,
       default: false,
     },
+    dataSegmentInputAttributes: {
+      type: Object,
+      required: false,
+      default: () => ({}),
+    },
   },
   data() {
     return {
@@ -405,6 +410,7 @@ export default {
       :multi-select="config.multiSelect"
       :options="config.options"
       :view-only="viewOnly"
+      :search-input-attributes="dataSegmentInputAttributes"
       @activate="activateDataSegment"
       @backspace="activateSegment($options.segments.SEGMENT_OPERATOR)"
       @complete="handleComplete"

package/src/scss/functions.scss

@@ -21,7 +21,7 @@
     @return $value;
   }
 
-  $converted: $value / $font-size-base;
+  $converted: calc($value / $font-size-base);
 
   @return strip-unit($converted) * 1rem;
 }
@@ -54,7 +54,7 @@
   $min-width: px-to-rem($min-width);
   $max-width: px-to-rem($max-width);
 
-  $slope: ($max - $min) / ($max-width - $min-width);
+  $slope: calc(($max - $min) / ($max-width - $min-width));
   $intersection: (-$min-width * $slope) + $min;
 
   // Use calc() inside of clamp() function to work around SassC