Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v9.6.4 #1847

Merged
merged 43 commits into from
Apr 4, 2024
Merged

v9.6.4 #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
c264e21
chore: setup input panel component
p-bemportato Mar 14, 2024
cf24e91
chore: generate readme
p-bemportato Mar 14, 2024
2aedbcf
chore: KupInputPanelData declaration
p-bemportato Mar 14, 2024
a78e9d0
feat: add first mock and events
p-bemportato Mar 15, 2024
3a05fad
wip: first data render
p-bemportato Mar 15, 2024
8d68bf9
feata: first input text render
p-bemportato Mar 19, 2024
789b67e
kup cmb
Mar 19, 2024
c484ebc
rework
Mar 19, 2024
8fc05a2
setup autocomplete
Mar 19, 2024
abe4289
feat: use cell for rendering input panel field
p-bemportato Mar 19, 2024
070e255
feat: handle options
p-bemportato Mar 21, 2024
5fa508d
feat: add mapdata adapter with colorpicker
p-bemportato Mar 21, 2024
21644f5
feat: checkbox
p-bemportato Mar 21, 2024
9935cc1
fix: use types instead of shapes
p-bemportato Mar 21, 2024
f4d1f2e
BTN List incomplete
Mar 21, 2024
a4dc21b
fix
Mar 21, 2024
676765c
fix
Mar 22, 2024
e4b7ac1
feat: build ketchup
p-bemportato Mar 22, 2024
873121c
feat: added input panel in showcase
p-bemportato Mar 22, 2024
d549b70
fix: remove console.log
p-bemportato Mar 22, 2024
e913ac6
feat: add radiobutton
p-bemportato Mar 26, 2024
fce0e32
chore: stencil e2e setup
Mar 26, 2024
3e3d1b0
chore: first e2e test setup
Mar 26, 2024
1c55d70
chore: second e2e test
Mar 26, 2024
c62a6d1
feat: added e2e with two textfields
p-bemportato Mar 26, 2024
6163352
merge develop
p-bemportato Mar 29, 2024
f905506
feat: autocomplete e2e test
p-bemportato Mar 29, 2024
b27cbc7
feat: combobox e2e test
p-bemportato Mar 29, 2024
a761e5d
feat: checkbox e2e test
p-bemportato Mar 29, 2024
37898b9
feat: radio buttons e2e test
p-bemportato Mar 29, 2024
f27facc
fix: added state for cell props
p-bemportato Mar 29, 2024
4b5919a
onValueChange
Apr 2, 2024
74e9b49
feat: handle events with callback
p-bemportato Apr 2, 2024
9db0ede
kup-pdf: implemented on develop
Hiren12345 Apr 3, 2024
f2693f0
Update yarn.lock
Hiren12345 Apr 3, 2024
14a6705
Merge pull request #1843 from dev01prishusoft/kup-pdf-2
lucafoscili Apr 3, 2024
a4c5e88
fix: retyping input panel options and rename pops
p-bemportato Apr 3, 2024
7850cc0
Merge pull request #1844 from apuliasoft/inputpanel
lucafoscili Apr 3, 2024
f4f6f9b
FCell: removed touchstart/end management.
lucafoscili Apr 4, 2024
198e8d4
Merge pull request #1846 from smeup/fcell-touch
pasere-smeup Apr 4, 2024
d407fb6
v9.6.4
lucafoscili Apr 4, 2024
45cae4a
Merge branch 'develop' into dev-to-mas
lucafoscili Apr 4, 2024
0a8a21c
Update yarn.lock
lucafoscili Apr 4, 2024
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
7 changes: 7 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
FROM mcr.microsoft.com/devcontainers/javascript-node:1-18-bullseye

# Install deps
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends chromium

# Define env vars
ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium

# [Optional] Uncomment if you want to install an additional version of node using nvm
ARG EXTRA_NODE_VERSION="lts/hydrogen"
RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
135 changes: 68 additions & 67 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,80 +1,81 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
{
"name": "@sme.up/ketchup-root",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"build": {
"dockerfile": "Dockerfile",
"args": {
"name": "@sme.up/ketchup-root",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "18-bullseye",
"EXTRA_NODE_VERSION": "18.16"
}
},
// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
// "ghcr.io/devcontainers/features/node:1": {
// "nodeGypDependencies": true,
// "version": "lts",
// "nvmVersion": "latest"
// },
"ghcr.io/devcontainers-contrib/features/lerna-npm:1": {
"version": "latest"
},
"ghcr.io/devcontainers-contrib/features/nx-npm:1": {
"version": "latest"
}
},
},
// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
// "ghcr.io/devcontainers/features/node:1": {
// "nodeGypDependencies": true,
// "version": "lts",
// "nvmVersion": "latest"
// },
"ghcr.io/devcontainers-contrib/features/lerna-npm:1": {
"version": "latest"
},
"ghcr.io/devcontainers-contrib/features/nx-npm:1": {
"version": "latest"
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "sh .devcontainer/scripts/postCreateCommand.sh",
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "sh .devcontainer/scripts/postCreateCommand.sh",

// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"octref.vetur"
],
"settings": {
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.validate": ["vue", "html", "javascript", "typescript"],
"eslint.run": "onSave",
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[vue]": {
"editor.defaultFormatter": "octref.vetur"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
}
},
// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"firsttris.vscode-jest-runner",
"octref.vetur"
],
"settings": {
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.validate": ["vue", "html", "javascript", "typescript"],
"eslint.run": "onSave",
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[vue]": {
"editor.defaultFormatter": "octref.vetur"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
}
},
"mounts": [
"source=ketchup-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume", // deps volume
"source=ketchup-vscode-extensions,target=/root/.vscode-server/extensions,type=volume" // vscode extensions volume
"source=ketchup-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume", // deps volume
"source=ketchup-vscode-extensions,target=/root/.vscode-server/extensions,type=volume" // vscode extensions volume
]

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
"lerna": "lerna",
"k:build": "lerna run build --scope @sme.up/ketchup --stream && lerna run build --scope @sme.up/ketchup-react --stream",
"k:start": "lerna run start --scope @sme.up/ketchup --stream",
"k:test:all": "lerna run test --scope @sme.up/ketchup --stream",
"k:test:e2e": "lerna run test:e2e --scope @sme.up/ketchup --stream",
"k:test:unit": "lerna run test:spec --scope @sme.up/ketchup --stream",
"k:test:unitcov": "lerna run test:speccov --scope @sme.up/ketchup --stream",
"ksc:serve": "lerna run serve --scope @sme.up/ketchup-showcase --stream",
Expand Down
4 changes: 2 additions & 2 deletions packages/ketchup-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sme.up/ketchup-react",
"version": "9.6.3",
"version": "9.6.4",
"module": "dist/index.js",
"typings": "dist/index.d.ts",
"keywords": [
Expand All @@ -20,7 +20,7 @@
"description": "Ketchup React Components library by smeup",
"license": "Apache-2.0",
"dependencies": {
"@sme.up/ketchup": "^9.6.3",
"@sme.up/ketchup": "^9.6.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/ketchup-react/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,13 @@ export const KupHorizontalScroll = /*@__PURE__*/createReactComponent<JSX.KupHori
export const KupIframe = /*@__PURE__*/createReactComponent<JSX.KupIframe, HTMLKupIframeElement>('kup-iframe');
export const KupImage = /*@__PURE__*/createReactComponent<JSX.KupImage, HTMLKupImageElement>('kup-image');
export const KupImageList = /*@__PURE__*/createReactComponent<JSX.KupImageList, HTMLKupImageListElement>('kup-image-list');
export const KupInputPanel = /*@__PURE__*/createReactComponent<JSX.KupInputPanel, HTMLKupInputPanelElement>('kup-input-panel');
export const KupLazy = /*@__PURE__*/createReactComponent<JSX.KupLazy, HTMLKupLazyElement>('kup-lazy');
export const KupList = /*@__PURE__*/createReactComponent<JSX.KupList, HTMLKupListElement>('kup-list');
export const KupMagicBox = /*@__PURE__*/createReactComponent<JSX.KupMagicBox, HTMLKupMagicBoxElement>('kup-magic-box');
export const KupNavBar = /*@__PURE__*/createReactComponent<JSX.KupNavBar, HTMLKupNavBarElement>('kup-nav-bar');
export const KupNumericPicker = /*@__PURE__*/createReactComponent<JSX.KupNumericPicker, HTMLKupNumericPickerElement>('kup-numeric-picker');
export const KupPdf = /*@__PURE__*/createReactComponent<JSX.KupPdf, HTMLKupPdfElement>('kup-pdf');
export const KupPhotoFrame = /*@__PURE__*/createReactComponent<JSX.KupPhotoFrame, HTMLKupPhotoFrameElement>('kup-photo-frame');
export const KupPlanner = /*@__PURE__*/createReactComponent<JSX.KupPlanner, HTMLKupPlannerElement>('kup-planner');
export const KupPlannerRenderer = /*@__PURE__*/createReactComponent<JSX.KupPlannerRenderer, HTMLKupPlannerRendererElement>('kup-planner-renderer');
Expand Down
1 change: 1 addition & 0 deletions packages/ketchup-showcase/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
module.exports = {
presets: ['@vue/cli-plugin-babel/preset'],
plugins: ['@babel/plugin-transform-private-methods'],
};
3 changes: 2 additions & 1 deletion packages/ketchup-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@sme.up/ketchup": "^9.6.3",
"@sme.up/ketchup": "^9.6.4",
"core-js": "^3.30.2",
"vue": "^2.6.14",
"vue-router": "^3.5.1"
},
"devDependencies": {
"@babel/plugin-transform-private-methods": "^7.24.1",
"@typescript-eslint/eslint-plugin": "^5.59.8",
"@typescript-eslint/parser": "^5.59.8",
"@vue/cli-plugin-babel": "~5.0.8",
Expand Down
Binary file not shown.
24 changes: 22 additions & 2 deletions packages/ketchup-showcase/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
@kup-tree-nodeselected="treeClick"
></kup-tree
><div class="version"
><a href="https://github.com/smeup/ketchup/releases/tag/v9.6.3"
>v9.6.3</a
><a href="https://github.com/smeup/ketchup/releases/tag/v9.6.4"
>v9.6.4</a
></div
></div
>
Expand Down Expand Up @@ -405,6 +405,16 @@ export default {
value: 'Image list',
visible: true,
},
{
cells: {
ROUTE: {
value: 'inputpanel',
},
},
icon: 'mode_edit',
value: 'Input Panel',
visible: true,
},
{
cells: {
ROUTE: {
Expand Down Expand Up @@ -634,6 +644,16 @@ export default {
value: 'Numeric picker',
visible: true,
},
{
cells: {
ROUTE: {
value: 'pdf',
},
},
icon: 'document',
value: 'Pdf',
visible: true,
},
{
cells: {
ROUTE: {
Expand Down
11 changes: 11 additions & 0 deletions packages/ketchup-showcase/src/plugins/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ const basicRoutes = [
component: () =>
import(`@/views/components/basic/numericpicker/NumericPicker.vue`),
},
{
path: `/pdf`,
name: 'pdf',
component: () => import(`@/views/components/basic/pdf/Pdf.vue`),
},
{
path: `/progressbar`,
name: 'progressbar',
Expand Down Expand Up @@ -240,6 +245,12 @@ const advancedRoutes = [
component: () =>
import(`@/views/components/advanced/imagelist/ImageList.vue`),
},
{
path: `/inputpanel`,
name: 'inputpanel',
component: () =>
import(`@/views/components/advanced/inputpanel/InputPanel.vue`),
},
{
path: `/tree`,
name: 'tree',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<template>
<div>
<comp :giturl="giturl" :headtitle="headtitle" :titles="titles">
<template v-slot:0>
<input-panel-demo></input-panel-demo>
</template>
<template v-slot:1>
<input-panel-basic></input-panel-basic>
</template>
</comp>
</div>
</template>

<script>
import InputPanelDemo from '@/views/components/advanced/inputpanel/examples/InputPanelDemo';
import InputPanelBasic from '@/views/components/advanced/inputpanel/examples/InputPanelBasic';
import Comp from '@/views/templates/Comp';
export default {
components: {
InputPanelDemo,
InputPanelBasic,
Comp,
},
data() {
return {
giturl:
'https://github.com/smeup/ketchup/tree/develop/packages/ketchup/src/components/kup-input-panel',
headtitle: 'Input Panel',
titles: ['Playground', 'Basic usage'],
};
},
title: 'Ketchup | Input Panel',
};
</script>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<template>
<div>
<div class="demo-wrapper">
<p>The Input Panel component arranges different input fields.</p>
<p class="centered">Sample markup</p>
<code class="flat">{{ markupBasic }}</code>
</div>
</div>
</template>

<script>
export default {
name: 'InputPanelBasic',
data() {
return {
markupBasic: '<kup-input-panel></kup-input-panel>',
};
},
};
</script>
Loading