Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/development' into feat-resizab…
Browse files Browse the repository at this point in the history
…le-columns
  • Loading branch information
Rohan Bansal committed Dec 16, 2024
2 parents 7b8cbdb + 13cadd0 commit e21218e
Show file tree
Hide file tree
Showing 142 changed files with 974 additions and 678 deletions.
24 changes: 24 additions & 0 deletions aform/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
{
"name": "@stonecrop/aform",
"entries": [
{
"version": "0.3.0",
"tag": "@stonecrop/aform_v0.3.0",
"date": "Mon, 16 Dec 2024 07:40:48 GMT",
"comments": {
"patch": [
{
"comment": "update import paths to avoid API extraction bugs"
}
]
}
},
{
"version": "0.2.67",
"tag": "@stonecrop/aform_v0.2.67",
"date": "Fri, 13 Dec 2024 12:32:30 GMT",
"comments": {}
},
{
"version": "0.2.66",
"tag": "@stonecrop/aform_v0.2.66",
"date": "Fri, 13 Dec 2024 12:15:19 GMT",
"comments": {}
},
{
"version": "0.2.65",
"tag": "@stonecrop/aform_v0.2.65",
Expand Down
19 changes: 18 additions & 1 deletion aform/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
# Change Log - @stonecrop/aform

This log was last generated on Fri, 13 Dec 2024 06:53:37 GMT and should not be manually modified.
This log was last generated on Mon, 16 Dec 2024 07:40:48 GMT and should not be manually modified.

## 0.3.0
Mon, 16 Dec 2024 07:40:48 GMT

### Patches

- update import paths to avoid API extraction bugs

## 0.2.67
Fri, 13 Dec 2024 12:32:30 GMT

_Version update only_

## 0.2.66
Fri, 13 Dec 2024 12:15:19 GMT

_Version update only_

## 0.2.65
Fri, 13 Dec 2024 06:53:37 GMT
Expand Down
11 changes: 0 additions & 11 deletions aform/config/api-extractor.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,5 @@
"docModel": {
"enabled": true,
"projectFolderUrl": "https://github.com/agritheory/stonecrop/tree/development/aform"
},

"messages": {
"extractorMessageReporting": {
// Disable this validation at your own risk: Processing an incorrect file type
// may lead to other errors. Function bodies may incorrectly get emitted in the
// .d.ts rollup.
"ae-wrong-input-file-type": {
"logLevel": "none"
}
}
}
}
2 changes: 1 addition & 1 deletion aform/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@stonecrop/aform",
"version": "0.2.65",
"version": "0.3.0",
"license": "MIT",
"type": "module",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion aform/src/components/AForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<script setup lang="ts">
import { ref, computed } from 'vue'
import type { SchemaTypes } from '@/types'
import type { SchemaTypes } from '../types'
const emit = defineEmits(['update:modelValue'])
const { modelValue, data, readonly } = defineProps<{
Expand Down
2 changes: 1 addition & 1 deletion aform/src/components/form/ACheckbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<script setup lang="ts">
import { InputHTMLAttributes } from 'vue'
import { ComponentProps } from '@/types'
import { ComponentProps } from '../../types'
const { label, required, readonly, uuid, validation = { errorMessage: '&nbsp;' } } = defineProps<ComponentProps>()
const checkbox = defineModel<InputHTMLAttributes['checked']>()
Expand Down
2 changes: 1 addition & 1 deletion aform/src/components/form/ADate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<script setup lang="ts">
import { useTemplateRef } from 'vue'
import { ComponentProps } from '@/types'
import { ComponentProps } from '../../types'
const {
label = 'Date',
Expand Down
6 changes: 3 additions & 3 deletions aform/src/components/form/AFieldset.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<script setup lang="ts">
import { ref } from 'vue'
import CollapseButton from '@/components/base/CollapseButton.vue'
import AForm from '@/components/AForm.vue'
import { SchemaTypes } from '@/types'
import CollapseButton from '../base/CollapseButton.vue'
import AForm from '../AForm.vue'
import { SchemaTypes } from '../../types'
const { schema, label, collapsible, data } = defineProps<{
schema: SchemaTypes[]
Expand Down
2 changes: 1 addition & 1 deletion aform/src/components/form/ANumericInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</template>

<script setup lang="ts">
import { ComponentProps } from '@/types'
import { ComponentProps } from '../../types'
const { label, required, readonly, uuid, validation = { errorMessage: '&nbsp;' } } = defineProps<ComponentProps>()
const inputNumber = defineModel<number>()
Expand Down
4 changes: 2 additions & 2 deletions aform/src/components/form/ATextInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<script setup lang="ts">
import { /* inject, */ ref } from 'vue'
import { useStringMask as vMask } from '@/directives/mask'
import { ComponentProps } from '@/types'
import { useStringMask as vMask } from '../../directives/mask'
import { ComponentProps } from '../../types'
const { label, mask, required, readonly, uuid, validation = { errorMessage: '&nbsp;' } } = defineProps<ComponentProps>()
Expand Down
2 changes: 1 addition & 1 deletion aform/src/directives/mask.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { DirectiveBinding } from 'vue'

import type { FormSchema } from '@/types'
import type { FormSchema } from '../types'

const NAMED_MASKS = {
date: '##/##/####',
Expand Down
1 change: 1 addition & 0 deletions aform/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export type { CellContext, TableConfig, TableColumn, TableRow } from '@stonecrop/atable'
import { App } from 'vue'

import ACheckbox from './components/form/ACheckbox.vue'
Expand Down
2 changes: 1 addition & 1 deletion aform/src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ export type FieldsetSchema = BasicSchema & {

/**
* Superset of schema types
* @public
* @beta
*/
export type SchemaTypes = FormSchema | TableSchema | FieldsetSchema
2 changes: 1 addition & 1 deletion aform/tests/checkbox.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { mount } from '@vue/test-utils'

import ACheckbox from '@/components/form/ACheckbox.vue'
import ACheckbox from '../src/components/form/ACheckbox.vue'

describe('checkbox component', () => {
let wrapper = mount(ACheckbox, {
Expand Down
2 changes: 1 addition & 1 deletion aform/tests/collapse.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { mount } from '@vue/test-utils'

import CollapseButton from '@/components/base/CollapseButton.vue'
import CollapseButton from '../src/components/base/CollapseButton.vue'

describe('numeric input component', () => {
it('apply specific class based on collapsed input', async () => {
Expand Down
2 changes: 1 addition & 1 deletion aform/tests/date.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { mount } from '@vue/test-utils'

import ADate from '@/components/form/ADate.vue'
import ADate from '../src/components/form/ADate.vue'

describe('date component', () => {
it('date input is rendered', async () => {
Expand Down
2 changes: 1 addition & 1 deletion aform/tests/datepicker.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { mount } from '@vue/test-utils'

import ADatePicker from '@/components/form/ADatePicker.vue'
import ADatePicker from '../src/components/form/ADatePicker.vue'

describe('datepicker component', () => {
it('emits update event when date is changed', async () => {
Expand Down
2 changes: 1 addition & 1 deletion aform/tests/dropdown.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { mount } from '@vue/test-utils'

import ADropdown from '@/components/form/ADropdown.vue'
import ADropdown from '../src/components/form/ADropdown.vue'

describe('dropdown input component', () => {
const dropdownData = {
Expand Down
2 changes: 1 addition & 1 deletion aform/tests/fieldset.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { mount } from '@vue/test-utils'

import AFieldset from '@/components/form/AFieldset.vue'
import AFieldset from '../src/components/form/AFieldset.vue'

describe('fieldset input component', () => {
it('no change in collapse status when fieldset is uncollapsible', async () => {
Expand Down
2 changes: 1 addition & 1 deletion aform/tests/login.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { mount } from '@vue/test-utils'

import Login from '@/components/utilities/Login.vue'
import Login from '../src/components/utilities/Login.vue'

describe('login component', () => {
it('mount the login component', async () => {
Expand Down
2 changes: 1 addition & 1 deletion aform/tests/numeric.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { mount } from '@vue/test-utils'

import ANumericInput from '@/components/form/ANumericInput.vue'
import ANumericInput from '../src/components/form/ANumericInput.vue'

describe('numeric input component', () => {
const numericInputModel = 25
Expand Down
2 changes: 1 addition & 1 deletion aform/tests/text.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { mount } from '@vue/test-utils'

import ATextInput from '@/components/form/ATextInput.vue'
import ATextInput from '../src/components/form/ATextInput.vue'

describe('text input component', () => {
it('skip input mask when one is not provided', async () => {
Expand Down
6 changes: 1 addition & 5 deletions aform/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"tsBuildInfoFile": "./dist/aform.tsbuildinfo",
"types": ["vitest/globals", "vitest/jsdom"],
"paths": {
"@/*": ["./src/*"],
"types/*": ["./src/types/*"]
}
"types": ["vitest/globals", "vitest/jsdom"]
},
"include": ["src/**/*.ts", "src/**/*.vue", "tests/**/*.spec.ts", "tests/**/*.ts", "tests/**/*.vue"]
}
6 changes: 0 additions & 6 deletions aform/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ const projectRootDir = resolve(__dirname)

export default defineConfig({
plugins: [vue(), libInjectCss()],
resolve: {
alias: {
'@': resolve(projectRootDir, 'src'),
types: resolve(projectRootDir, 'src/types'),
},
},
build: {
emptyOutDir: false,
sourcemap: true,
Expand Down
30 changes: 30 additions & 0 deletions atable/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,36 @@
{
"name": "@stonecrop/atable",
"entries": [
{
"version": "0.3.0",
"tag": "@stonecrop/atable_v0.3.0",
"date": "Mon, 16 Dec 2024 07:40:48 GMT",
"comments": {
"patch": [
{
"comment": "update import paths to avoid API extraction bugs"
}
]
}
},
{
"version": "0.2.67",
"tag": "@stonecrop/atable_v0.2.67",
"date": "Fri, 13 Dec 2024 12:32:30 GMT",
"comments": {}
},
{
"version": "0.2.66",
"tag": "@stonecrop/atable_v0.2.66",
"date": "Fri, 13 Dec 2024 12:15:19 GMT",
"comments": {
"patch": [
{
"comment": "minor style updates for Atable"
}
]
}
},
{
"version": "0.2.65",
"tag": "@stonecrop/atable_v0.2.65",
Expand Down
21 changes: 20 additions & 1 deletion atable/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
# Change Log - @stonecrop/atable

This log was last generated on Fri, 13 Dec 2024 06:53:37 GMT and should not be manually modified.
This log was last generated on Mon, 16 Dec 2024 07:40:48 GMT and should not be manually modified.

## 0.3.0
Mon, 16 Dec 2024 07:40:48 GMT

### Patches

- update import paths to avoid API extraction bugs

## 0.2.67
Fri, 13 Dec 2024 12:32:30 GMT

_Version update only_

## 0.2.66
Fri, 13 Dec 2024 12:15:19 GMT

### Patches

- minor style updates for Atable

## 0.2.65
Fri, 13 Dec 2024 06:53:37 GMT
Expand Down
11 changes: 0 additions & 11 deletions atable/config/api-extractor.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,5 @@
"docModel": {
"enabled": true,
"projectFolderUrl": "https://github.com/agritheory/stonecrop/tree/development/atable"
},

"messages": {
"extractorMessageReporting": {
// Disable this validation at your own risk: Processing an incorrect file type
// may lead to other errors. Function bodies may incorrectly get emitted in the
// .d.ts rollup.
"ae-wrong-input-file-type": {
"logLevel": "none"
}
}
}
}
2 changes: 1 addition & 1 deletion atable/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@stonecrop/atable",
"version": "0.2.65",
"version": "0.3.0",
"license": "MIT",
"type": "module",
"author": {
Expand Down
6 changes: 3 additions & 3 deletions atable/src/components/ACell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import { vOnClickOutside } from '@vueuse/components'
import { useElementBounding } from '@vueuse/core'
import { computed, CSSProperties, ref, useTemplateRef } from 'vue'
import { createTableStore } from '@/stores/table'
import { isHtmlString } from '@/utils'
import { createTableStore } from '../stores/table'
import { isHtmlString } from '../utils'
const {
colIndex,
Expand Down Expand Up @@ -74,7 +74,7 @@ const cellStyle = computed((): CSSProperties => {
return {
textAlign,
width: cellWidth,
backgroundColor: !cellModified.value ? 'inherit' : 'var(--sc-cell-modified)',
backgroundColor: !cellModified.value ? 'inherit' : 'var(--sc-cell-changed-color)',
fontWeight: !cellModified.value ? 'inherit' : 'bold',
paddingLeft: store.getIndent(colIndex, store.display[rowIndex]?.indent),
}
Expand Down
Loading

0 comments on commit e21218e

Please sign in to comment.