Component with contentQuestion doesn't work correctly. fixed #112

src/entries/pdf.ts

@@ -5,6 +5,7 @@ export { FlatRepository } from '../flat_layout/flat_repository';
 export { IFlatQuestion, FlatQuestion } from '../flat_layout/flat_question';
 export { FlatBoolean } from '../flat_layout/flat_boolean';
 export { FlatCheckbox } from '../flat_layout/flat_checkbox';
+export { FlatCustomModel } from '../flat_layout/flat_custom_model';
 export { FlatComment } from '../flat_layout/flat_comment';
 export { FlatDropdown } from '../flat_layout/flat_dropdown';
 export { FlatExpression } from '../flat_layout/flat_expression';

src/flat_layout/flat_custom_model.ts

@@ -0,0 +1,19 @@
+import { IQuestion, QuestionCustomModel } from 'survey-core';
+import { SurveyPDF } from '../survey';
+import { IPoint, DocController } from '../doc_controller';
+import { FlatQuestion } from './flat_question';
+import { FlatRepository } from './flat_repository';
+import { IPdfBrick } from '../pdf_render/pdf_brick';
+
+export class FlatCustomModel extends FlatQuestion {
+    constructor(protected survey: SurveyPDF,
+        question: IQuestion, protected controller: DocController) {
+        super(survey, question, controller);
+    }
+    public async generateFlatsContent(point: IPoint): Promise<IPdfBrick[]> {
+        const flat = FlatRepository.getInstance().create(this.survey, this.question, this.controller, this.question.getType());
+        return flat.generateFlatsContent(point);
+    }
+}
+
+FlatRepository.getInstance().register('custom_model', FlatCustomModel);

src/helper_survey.ts

@@ -589,6 +589,10 @@ export class SurveyHelper {
     public static getContentQuestion(question: Question): Question {
         return !!(<any>question).contentQuestion ? (<any>question).contentQuestion : question;
     }
+    public static getContentQuestionType(question: Question): string {
+        if(!!question.customWidget) return question.customWidget.pdfQuestionType;
+        return !!(<any>question).contentQuestion ? "custom_model" : question.getType();
+    }
     public static getRatingMinWidth(controller: DocController): number {
         return controller.measureText(this.RATING_MIN_WIDTH).width;
     }
@@ -649,9 +653,7 @@ export class SurveyHelper {
     }
     public static async generateQuestionFlats(survey: SurveyPDF,
         controller: DocController, question: Question, point: IPoint): Promise<IPdfBrick[]> {
-        const questionComposite: Question = this.getContentQuestion(question);
-        const questionType: string = question.customWidget ?
-            question.customWidget.pdfQuestionType : questionComposite.getType();
+        const questionType: string = this.getContentQuestionType(question);
         const flatQuestion: IFlatQuestion = FlatRepository.getInstance().
             create(survey, question, controller, questionType);
         const questionFlats: IPdfBrick[] = await flatQuestion.generateFlats(point);

tests/flat_custom_component.test.ts

@@ -0,0 +1,32 @@
+(<any>window)['HTMLCanvasElement'].prototype.getContext = async () => {
+    return {};
+};
+
+import { ComponentCollection } from 'survey-core';
+import { SurveyPDF } from '../src/survey';
+import { IRect, IPoint, DocController } from '../src/doc_controller';
+import { FlatSurvey } from '../src/flat_layout/flat_survey';
+import { FlatRanking } from '../src/flat_layout/flat_ranking';
+import { IPdfBrick } from '../src/pdf_render/pdf_brick';
+import { TextBrick } from '../src/pdf_render/pdf_text';
+import { SurveyHelper } from '../src/helper_survey';
+import { TestHelper } from '../src/helper_test';
+const __dummy_rn: FlatRanking = new FlatRanking(null, null, null);
+
+test('Check ranking in custom component', async () => {
+    ComponentCollection.Instance.add({ name: 'comp', questionJSON: { type: 'rating', choices: ['A', 'B'] } });
+    const json: any = {
+        questions: [
+            {
+                titleLocation: 'hidden',
+                name: 'comp',
+                type: 'comp'
+            }
+        ]
+    };
+    const survey: SurveyPDF = new SurveyPDF(json, TestHelper.defaultOptions);
+    const controller: DocController = new DocController(TestHelper.defaultOptions);
+    const flats: IPdfBrick[][] = await FlatSurvey.generateFlats(survey, controller);
+    expect(flats.length).toBe(1);
+    ComponentCollection.Instance.clear();
+});