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.

Sign up for GitHub

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

Jump to bottom

Revert "feat(ConfigProvider): sfc changed to tsx" #1458

Merged
merged 1 commit into from
Jun 18, 2024
Merged

Revert "feat(ConfigProvider): sfc changed to tsx" #1458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions src/config-provider/__test__/__snapshots__/demo.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ exports[`ConfigProvider > ConfigProvider mobileVue demo works fine 1`] = `
>



<div
class="upload-demo"
data-v-41cb315a=""
Expand Down Expand Up @@ -326,7 +325,6 @@ exports[`ConfigProvider > ConfigProvider mobileVue demo works fine 1`] = `
</div>



</div>
</div>
<div
Expand All @@ -347,7 +345,6 @@ exports[`ConfigProvider > ConfigProvider mobileVue demo works fine 1`] = `
>



<!-- 全局配置：空数据呈现，演示 -->
<div
class="t-table t-vertical-align-middle t-table--bordered"
Expand Down Expand Up @@ -424,7 +421,6 @@ exports[`ConfigProvider > ConfigProvider mobileVue demo works fine 1`] = `
</div>



</div>
</div>
<div
Expand All @@ -445,7 +441,6 @@ exports[`ConfigProvider > ConfigProvider mobileVue demo works fine 1`] = `
>



<div
class="rate-demo-cell rate-demo-cell--space"
data-v-0f72cd9e=""
Expand Down Expand Up @@ -3585,7 +3580,6 @@ exports[`ConfigProvider > ConfigProvider mobileVue demo works fine 1`] = `
</teleport-stub>



</div>
</div>
</div>
Expand All @@ -3596,7 +3590,6 @@ exports[`ConfigProvider > ConfigProvider otherEnVue demo works fine 1`] = `
data-v-app=""
>


<div
class="rate-demo-cell rate-demo-cell--space"
data-v-0f72cd9e=""
Expand Down Expand Up @@ -6735,7 +6728,6 @@ exports[`ConfigProvider > ConfigProvider otherEnVue demo works fine 1`] = `
</div>
</teleport-stub>


</div>
`;

Expand All @@ -6744,7 +6736,6 @@ exports[`ConfigProvider > ConfigProvider tableEnVue demo works fine 1`] = `
data-v-app=""
>


<!-- 全局配置：空数据呈现，演示 -->
<div
class="t-table t-vertical-align-middle t-table--bordered"
Expand Down Expand Up @@ -6820,7 +6811,6 @@ exports[`ConfigProvider > ConfigProvider tableEnVue demo works fine 1`] = `
</div>
</div>


</div>
`;

Expand All @@ -6829,7 +6819,6 @@ exports[`ConfigProvider > ConfigProvider uploadEnVue demo works fine 1`] = `
data-v-app=""
>


<div
class="upload-demo"
data-v-41cb315a=""
Expand Down Expand Up @@ -7118,6 +7107,5 @@ exports[`ConfigProvider > ConfigProvider uploadEnVue demo works fine 1`] = `
</div>
</div>


</div>
`;
13 changes: 9 additions & 4 deletions src/config-provider/config-provider.tsx → src/config-provider/config-provider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<template>
<slot />
</template>

<script lang="ts">
import { defineComponent, PropType } from 'vue';
import config from '../config';
import { GlobalConfigProvider } from './type';
import { provideConfig } from './useConfig';
import { useTNodeJSX } from '../hooks/tnode';

const { prefix } = config;
const name = `${prefix}-config-provider`;
Expand All @@ -22,8 +26,9 @@ export default defineComponent({
setup(props) {
provideConfig(props);

const renderTNodeJSX = useTNodeJSX();

return () => <>{renderTNodeJSX('default')}</>;
return {
name,
};
},
});
</script>
2 changes: 1 addition & 1 deletion src/config-provider/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { withInstall } from '../shared';
import _ConfigProvider from './config-provider';
import _ConfigProvider from './config-provider.vue';

export * from './type';

Expand Down
2 changes: 1 addition & 1 deletion src/config-provider/useConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import isString from 'lodash/isString';

import { defaultGlobalConfig, configProviderInjectKey, mergeWith } from './context';
import { GlobalConfigProvider } from './type';
import type { ConfigProviderProps } from './config-provider';
import type { ConfigProviderProps } from './config-provider.vue';

// 这是为了解决在非component里调用useConfig hook时发出的警告
// https://github.com/Tencent/tdesign-vue-next/issues/2025
Expand Down
Loading
Loading